Daniel Gibbs 6 rokov pred
rodič
commit
41b40c7c78

+ 1 - 1
lgsm/functions/command_console.sh

@@ -19,7 +19,7 @@ fn_print_warning_nl "Do NOT press CTRL+c to exit."
 echo -e "	* https://docs.linuxgsm.com/commands/console"
 echo -e "	* https://docs.linuxgsm.com/commands/console"
 echo -e ""
 echo -e ""
 if ! fn_prompt_yn "Continue?" Y; then
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; return
+	return
 fi
 fi
 fn_print_dots "Accessing console"
 fn_print_dots "Accessing console"
 check_status.sh
 check_status.sh

+ 1 - 1
lgsm/functions/command_debug.sh

@@ -86,7 +86,7 @@ echo -e "Press CTRL+c to drop out of debug mode."
 fn_print_warning_nl "If ${servicename} is already running it will be stopped."
 fn_print_warning_nl "If ${servicename} is already running it will be stopped."
 echo -e ""
 echo -e ""
 if ! fn_prompt_yn "Continue?" Y; then
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; return
+	return
 fi
 fi
 
 
 fn_print_info_nl "Stopping any running servers"
 fn_print_info_nl "Stopping any running servers"

+ 1 - 1
lgsm/functions/command_mods_install.sh

@@ -87,7 +87,7 @@ if [ -f "${modsinstalledlistfullpath}" ]; then
 		fn_script_log_warn "${modprettyname} is already installed"
 		fn_script_log_warn "${modprettyname} is already installed"
 		echo -e " * Any configs may be overwritten."
 		echo -e " * Any configs may be overwritten."
 		if ! fn_prompt_yn "Continue?" Y; then
 		if ! fn_prompt_yn "Continue?" Y; then
-			echo Exiting; core_exit.sh
+			core_exit.sh
 		fi
 		fi
 		fn_script_log_info "User selected to continue"
 		fn_script_log_info "User selected to continue"
 	fi
 	fi

+ 1 - 1
lgsm/functions/command_mods_remove.sh

@@ -46,7 +46,7 @@ done
 fn_print_warning_nl "You are about to remove ${cyan}${usermodselect}${default}."
 fn_print_warning_nl "You are about to remove ${cyan}${usermodselect}${default}."
 echo -e " * Any custom files/configuration will be removed."
 echo -e " * Any custom files/configuration will be removed."
 if ! fn_prompt_yn "Continue?" Y; then
 if ! fn_prompt_yn "Continue?" Y; then
-	echo Exiting; exit
+	core_exit.sh
 fi
 fi
 
 
 currentmod="${usermodselect}"
 currentmod="${usermodselect}"

+ 4 - 4
lgsm/functions/command_ts3_server_pass.sh

@@ -5,8 +5,8 @@
 # Website: https://linuxgsm.com
 # Website: https://linuxgsm.com
 # Description: Changes TS3 serveradmin password.
 # Description: Changes TS3 serveradmin password.
 
 
-local commandname="TS3-CHANGE-PASS"
-local commandaction="ServerAdmin Password Change"
+local commandname="PASSWORD-CHANGE"
+local commandaction="Password Change"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 fn_serveradmin_password_prompt(){
 fn_serveradmin_password_prompt(){
@@ -22,7 +22,7 @@ fn_serveradmin_password_prompt(){
 }
 }
 
 
 fn_serveradmin_password_set(){
 fn_serveradmin_password_set(){
-	fn_print_info_nl "Starting server with new password"
+	fn_print_info_nl "Starting "
 	fn_script_log_info "Starting server with new password"
 	fn_script_log_info "Starting server with new password"
 	# Start server in "new password mode".
 	# Start server in "new password mode".
 	ts3serverpass="1"
 	ts3serverpass="1"
@@ -41,7 +41,7 @@ if [ "${status}" != "0" ]; then
 	exitbypass="1"
 	exitbypass="1"
 	command_stop.sh
 	command_stop.sh
 	fn_serveradmin_password_set
 	fn_serveradmin_password_set
-	parms="inifile=${servercfgfullpath} pid_file=ts3server.pid"
+	parms="serveradmin_password="${newpassword}" inifile="${servercfgfullpath}" > /dev/null 2>&1"
 	ts3serverpass="0"
 	ts3serverpass="0"
 	fn_print_info_nl "Restarting server normally"
 	fn_print_info_nl "Restarting server normally"
 	fn_script_log_info "Restarting server normally"
 	fn_script_log_info "Restarting server normally"

+ 1 - 1
lgsm/functions/command_wipe.sh

@@ -185,7 +185,7 @@ if [ "${shortname}" == "rust" ]; then
 	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
 	if [ -d "${serveridentitydir}/storage" ]||[ -d "${serveridentitydir}/user" ]||[ -n "$(find "${serveridentitydir}" -type f -name "proceduralmap*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "barren*.sav")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "Log.*.txt")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.deaths.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "player.blueprints.*.db")" ]||[ -n "$(find "${serveridentitydir}" -type f -name "sv.files.*.db")" ]; then
 		fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased."
 		fn_print_warning_nl "Any user, storage, log and map data from ${serveridentitydir} will be erased."
 		if ! fn_prompt_yn "Continue?" Y; then
 		if ! fn_prompt_yn "Continue?" Y; then
-				echo Exiting; core_exit.sh
+				core_exit.sh
 		fi
 		fi
 		fn_script_log_info "User selects to erase any user, storage, log and map data from ${serveridentitydir}"
 		fn_script_log_info "User selects to erase any user, storage, log and map data from ${serveridentitydir}"
 		fn_sleep_time
 		fn_sleep_time

+ 1 - 1
lgsm/functions/compress_unreal2_maps.sh

@@ -18,7 +18,7 @@ echo -e ""
 echo -e "${compressedmapsdir}"
 echo -e "${compressedmapsdir}"
 echo -e ""
 echo -e ""
 if ! fn_prompt_yn "Start compression?" Y; then
 if ! fn_prompt_yn "Start compression?" Y; then
-	echo Exiting; return
+	return
 fi
 fi
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 rm -rfv "${serverfiles}/Maps/"*.ut2.uz2
 rm -rfv "${serverfiles}/Maps/"*.ut2.uz2

+ 1 - 1
lgsm/functions/compress_ut99_maps.sh

@@ -18,7 +18,7 @@ echo -e ""
 echo -e "${compressedmapsdir}"
 echo -e "${compressedmapsdir}"
 echo -e ""
 echo -e ""
 if ! fn_prompt_yn "Start compression?" Y; then
 if ! fn_prompt_yn "Start compression?" Y; then
-	echo Exiting; return
+	return
 fi
 fi
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 mkdir -pv "${compressedmapsdir}" > /dev/null 2>&1
 rm -rfv "${serverfiles}/Maps/"*.unr.uz
 rm -rfv "${serverfiles}/Maps/"*.unr.uz

+ 2 - 2
lgsm/functions/install_retry.sh

@@ -9,7 +9,7 @@ local commandaction="Install"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 local function_selfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 
 if fn_prompt_yn "Retry install?" Y; then
 if fn_prompt_yn "Retry install?" Y; then
-	command_install.sh; exit
+	command_install.sh; core_exit.sh
 else
 else
-	echo Exiting; exit
+	core_exit.sh
 fi
 fi