فهرست منبع

Shellcheck code tidy

SC2164
SC2086
SC2062
SC2046
SC2143
SC2086
SC2164
Daniel Gibbs 8 سال پیش
والد
کامیت
64701aceae

+ 1 - 1
lgsm/functions/check_glibc.sh

@@ -17,7 +17,7 @@ elif [ "${glibcrequired}" == "UNKNOWN" ]; then
 		fn_print_error_nl "Glibc fix: ${red}${glibcrequired}${default}"
 		fn_print_error_nl "Glibc fix: ${red}${glibcrequired}${default}"
 		echo -e "	* glibc required: ${red}${glibcrequired}${default}"
 		echo -e "	* glibc required: ${red}${glibcrequired}${default}"
 		echo -e "	* glibc installed: ${glibcversion}"
 		echo -e "	* glibc installed: ${glibcversion}"
-elif [ "$(printf '%s\n'${glibcrequired}'\n' ${glibcversion} | sort -V | head -n 1)" != "${glibcrequired}" ]; then
+elif [ "$(printf "%s\n'${glibcrequired}'\n" "${glibcversion}" | sort -V | head -n 1)" != "${glibcrequired}" ]; then
 	if [ "${glibcfix}" == "yes" ]; then
 	if [ "${glibcfix}" == "yes" ]; then
 		if [ "${function_selfname}" != "command_install.sh" ]; then
 		if [ "${function_selfname}" != "command_install.sh" ]; then
 			fn_print_dots "Glibc fix"
 			fn_print_dots "Glibc fix"

+ 2 - 2
lgsm/functions/command_stop.sh

@@ -219,14 +219,14 @@ fn_stop_ark(){
 	if [ "${#queryport}" -gt 0 ] ; then
 	if [ "${#queryport}" -gt 0 ] ; then
 		for (( pidcheck=0 ; pidcheck < ${maxpiditer} ; pidcheck++ )) ; do
 		for (( pidcheck=0 ; pidcheck < ${maxpiditer} ; pidcheck++ )) ; do
 			pid=$(netstat -nap 2>/dev/null | grep ^udp[[:space:]] |\
 			pid=$(netstat -nap 2>/dev/null | grep ^udp[[:space:]] |\
-				grep :${queryport}[[:space:]] | rev | awk '{print $1}' |\
+				grep ":${queryport}[[:space:]]" | rev | awk '{print $1}' |\
 				rev | cut -d\/ -f1)
 				rev | cut -d\/ -f1)
 			#
 			#
 			# check for a valid pid
 			# check for a valid pid
 			pid=${pid//[!0-9]/}
 			pid=${pid//[!0-9]/}
 			let pid+=0 # turns an empty string into a valid number, '0',
 			let pid+=0 # turns an empty string into a valid number, '0',
 			# and a valid numeric pid remains unchanged.
 			# and a valid numeric pid remains unchanged.
-			if [ "${pid}" -gt 1 ]&&[ "${pid}" -le $(cat "/proc/sys/kernel/pid_max") ]; then
+			if [ "${pid}" -gt 1 ]&&[ "${pid}" -le "$(cat "/proc/sys/kernel/pid_max")" ]; then
 			fn_print_dots "Process still bound. Awaiting graceful exit: ${pidcheck}"
 			fn_print_dots "Process still bound. Awaiting graceful exit: ${pidcheck}"
 				sleep 1
 				sleep 1
 			else
 			else

+ 1 - 2
lgsm/functions/install_config.sh

@@ -61,8 +61,7 @@ fn_set_config_vars(){
 		echo "changing hostname."
 		echo "changing hostname."
 		fn_script_log_info "changing hostname."
 		fn_script_log_info "changing hostname."
 		sleep 1
 		sleep 1
-
-		if [ "$(grep SERVERNAME=SERVERNAME \"${lgsmdir}/config-default/config-game/${config}\" 2>/dev/null)" ]; then
+		if grep -q "SERVERNAME=SERVERNAME" "${lgsmdir}/config-default/config-game/${config}" 2>/dev/null; then
 			sed -i "s/SERVERNAME=SERVERNAME/SERVERNAME=${servername}/g" "${servercfgfullpath}"
 			sed -i "s/SERVERNAME=SERVERNAME/SERVERNAME=${servername}/g" "${servercfgfullpath}"
 		else
 		else
 			sed -i "s/SERVERNAME/${servername}/g" "${servercfgfullpath}"
 			sed -i "s/SERVERNAME/${servername}/g" "${servercfgfullpath}"

+ 16 - 14
lgsm/functions/install_ts3db.sh

@@ -14,7 +14,7 @@ fn_install_ts3db_mariadb(){
 	echo "checking if libmariadb2 is installed"
 	echo "checking if libmariadb2 is installed"
 	echo "================================="
 	echo "================================="
 	sleep 1
 	sleep 1
-	ldd ${serverfiles}/libts3db_mariadb.so | grep "libmariadb.so.2 => not found"
+	ldd "${serverfiles}/libts3db_mariadb.so" | grep "libmariadb.so.2 => not found"
 	if [ $? -eq 0 ]; then
 	if [ $? -eq 0 ]; then
 		echo "libmariadb2 not installed. Please install it first."
 		echo "libmariadb2 not installed. Please install it first."
 		echo "exiting..."
 		echo "exiting..."
@@ -26,19 +26,21 @@ fn_install_ts3db_mariadb(){
 	echo "Configuring ${gamename} Server for MariaDB/MySQL"
 	echo "Configuring ${gamename} Server for MariaDB/MySQL"
 	echo "================================="
 	echo "================================="
 	sleep 1
 	sleep 1
-	read -p "Enter MariaDB hostname: " mariahostname
-	read -p "Enter MariaDB port: " mariaport
-	read -p "Enter MariaDB username: " mariausername
-	read -p "Enter MariaDB password: " mariapassword
-	read -p "Enter MariaDB database name: " mariadbname
+	read -rp "Enter MariaDB hostname: " mariahostname
+	read -rp "Enter MariaDB port: " mariaport
+	read -rp "Enter MariaDB username: " mariausername
+	read -rp "Enter MariaDB password: " mariapassword
+	read -rp "Enter MariaDB database name: " mariadbname
+	{
 	echo "updating config."
 	echo "updating config."
-	echo "[config]" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "host='${mariahostname}'" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "port='${mariaport}'" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "username='${mariausername}'" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "password='${mariapassword}'" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "database='${mariadbname}'" >> ${servercfgdir}/ts3db_mariadb.ini
-	echo "socket=" >> ${servercfgdir}/ts3db_mariadb.ini
+	echo "[config]"
+	echo "host='${mariahostname}'"
+	echo "port='${mariaport}'"
+	echo "username='${mariausername}'"
+	echo "password='${mariapassword}'"
+	echo "database='${mariadbname}'"
+	echo "socket="
+	} >> "${servercfgdir}/ts3db_mariadb.ini"
 	sed -i "s/dbplugin=ts3db_sqlite3/dbplugin=ts3db_mariadb/g" "${servercfgfullpath}"
 	sed -i "s/dbplugin=ts3db_sqlite3/dbplugin=ts3db_mariadb/g" "${servercfgfullpath}"
 	sed -i "s/dbpluginparameter=/dbpluginparameter=ts3db_mariadb.ini/g" "${servercfgfullpath}"
 	sed -i "s/dbpluginparameter=/dbpluginparameter=ts3db_mariadb.ini/g" "${servercfgfullpath}"
 	sed -i "s/dbsqlcreatepath=create_sqlite\//dbsqlcreatepath=create_mariadb\//g" "${servercfgfullpath}"
 	sed -i "s/dbsqlcreatepath=create_sqlite\//dbsqlcreatepath=create_mariadb\//g" "${servercfgfullpath}"
@@ -69,7 +71,7 @@ echo "================================="
 sleep 1
 sleep 1
 echo "IMPORANT! Save these details for later."
 echo "IMPORANT! Save these details for later."
 sleep 1
 sleep 1
-cd "${executabledir}"
+cd "${executabledir}" || exit
 ./ts3server_startscript.sh start inifile=ts3-server.ini
 ./ts3server_startscript.sh start inifile=ts3-server.ini
 sleep 5
 sleep 5
 ./ts3server_startscript.sh stop
 ./ts3server_startscript.sh stop

+ 1 - 1
lgsm/functions/update_steamcmd.sh

@@ -165,7 +165,7 @@ fn_update_steamcmd_check(){
 	fi
 	fi
 
 
 	# Gets availablebuild info
 	# Gets availablebuild info
-	cd "${steamcmddir}"
+	cd "${steamcmddir}" || exit
 	availablebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +app_info_print "${appid}" +quit | sed -n '/branch/,$p' | grep -m 1 buildid | tr -cd '[:digit:]')
 	availablebuild=$(./steamcmd.sh +login "${steamuser}" "${steampass}" +app_info_update 1 +app_info_print "${appid}" +app_info_print "${appid}" +quit | sed -n '/branch/,$p' | grep -m 1 buildid | tr -cd '[:digit:]')
 	if [ -z "${availablebuild}" ]; then
 	if [ -z "${availablebuild}" ]; then
 		fn_print_fail "Checking for update: SteamCMD"
 		fn_print_fail "Checking for update: SteamCMD"