function_selfname is now local

9 years ago · b013b20aa8
26 changed files with 26 additions and 27 deletions
--- a/functions/command_update_functions.sh
+++ b/functions/command_update_functions.sh
@ -6,7 +6,7 @@ lgsm_version="210516"

 # Description: Deletes the functions dir to allow re-downloading of functions from GitHub.

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 check.sh
 fn_print_dots "Updating functions"
 fn_script_log "Updating functions"
--- a/lgsm/functions/alert_pushbullet.sh
+++ b/lgsm/functions/alert_pushbullet.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: alerts using pushbullet.

 local modulename="Alert"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 fn_print_dots "Sending Pushbullet alert"
 sleep 1

--- a/lgsm/functions/command_backup.sh
+++ b/lgsm/functions/command_backup.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Creates a .tar.gz file in the backup directory.

 local modulename="Backup"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 info_distro.sh
--- a/lgsm/functions/command_console.sh
+++ b/lgsm/functions/command_console.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Gives access to the server tmux console.

 local modulename="Console"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 echo ""
@ -45,7 +45,6 @@ else
 		* ) echo "Please answer yes or no.";;
 	esac
 	done
-	function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 fi

 core_exit.sh
--- a/lgsm/functions/command_debug.sh
+++ b/lgsm/functions/command_debug.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Runs the server without tmux. Runs direct from the terminal.

 local modulename="Debug"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 # Trap to remove lockfile on quit.
 fn_lockfile_trap(){
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@ -6,7 +6,7 @@ lgsm_version="190616"

 # Description: Displays server infomation.

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 # Standard Details
 # This applies to all engines
--- a/lgsm/functions/command_dev_debug.sh
+++ b/lgsm/functions/command_dev_debug.sh
@ -6,7 +6,7 @@ lgsm_version="210516"

 # Description: Dev only: enables debuging log to be saved to dev-debug.log.

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 if [ -f ".dev-debug" ]; then
 	rm .dev-debug
--- a/lgsm/functions/command_dev_detect_deps.sh
+++ b/lgsm/functions/command_dev_detect_deps.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Detects dependencies the server binary requires.

 local modulename="Backup"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 cd "${executabledir}"
--- a/lgsm/functions/command_fastdl.sh
+++ b/lgsm/functions/command_fastdl.sh
@ -8,7 +8,7 @@ lgsm_version="060616"
 # Description: Creates a FastDL folder

 local modulename="FastDL"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh

--- a/lgsm/functions/command_install.sh
+++ b/lgsm/functions/command_install.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Overall function for the installer.

 local modulename="Install"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 install_header.sh
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@ -8,7 +8,7 @@ lgsm_version="210516"
 # then passes to monitor_gsquery.sh.

 local modulename="Monitor"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_monitor_check_lockfile(){
 	# Monitor does not run it lockfile is not found
--- a/lgsm/functions/command_restart.sh
+++ b/lgsm/functions/command_restart.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Starts the server.

 local modulename="Restarting"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 exitbypass=1
 info_config.sh
--- a/lgsm/functions/command_start.sh
+++ b/lgsm/functions/command_start.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Starts the server.

 local modulename="Starting"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_start_teamspeak3(){
 	if [ ! -e "${servercfgfullpath}" ]; then
--- a/lgsm/functions/command_stop.sh
+++ b/lgsm/functions/command_stop.sh
@ -7,7 +7,7 @@ lgsm_version="050616"
 # Description: Stops the server.

 local modulename="Stopping"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 # Attempts Graceful of source using rcon 'quit' command.
 fn_stop_graceful_source(){
--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Sends a test email alert.

 local modulename="Alert"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 info_config.sh
--- a/lgsm/functions/command_ts3_server_pass.sh
+++ b/lgsm/functions/command_ts3_server_pass.sh
@ -8,7 +8,7 @@ lgsm_version="210516"
 # Description: Changes TS3 serveradmin password

 local modulename="Change password"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"


 fn_serveradmin_password_prompt(){
--- a/lgsm/functions/command_update.sh
+++ b/lgsm/functions/command_update.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description:Hangles updating of servers.

 local modulename="Update"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh

--- a/lgsm/functions/command_update_functions.sh
+++ b/lgsm/functions/command_update_functions.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Deletes the functions dir to allow re-downloading of functions from GitHub.

 local modulename="Updating LGSM"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 check.sh
 fn_print_dots "Updating functions"
 fn_script_log_info "Updating functions"
--- a/lgsm/functions/command_validate.sh
+++ b/lgsm/functions/command_validate.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Runs a server validation.

 local modulename="Validate"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_validation(){
 	fn_print_warn_nl "Validating may overwrite some customised files."
--- a/lgsm/functions/compress_unreal2_maps.sh
+++ b/lgsm/functions/compress_unreal2_maps.sh
@ -4,7 +4,7 @@
 # Website: https://gameservermanagers.com
 lgsm_version="210516"

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 clear
--- a/lgsm/functions/compress_ut99_maps.sh
+++ b/lgsm/functions/compress_ut99_maps.sh
@ -4,7 +4,7 @@
 # Website: https://gameservermanagers.com
 lgsm_version="210516"

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 check.sh
 clear
--- a/lgsm/functions/core_dl.sh
+++ b/lgsm/functions/core_dl.sh
@ -19,7 +19,7 @@ lgsm_version="210516"
 # fn_fetch_file "http://example.com/file.tar.bz2" "/some/dir" "file.tar.bz2" "executecmd" "run" "force" "10cd7353aa9d758a075c600a6dd193fd"

 local modulename="Download"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_dl_md5(){
 	# Runs MD5 Check if available
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@ -6,7 +6,7 @@ lgsm_version="210516"

 # Description: getopt arguments.

-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_getopt_generic(){
 case "${getopt}" in
--- a/lgsm/functions/update_check.sh
+++ b/lgsm/functions/update_check.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Checks if a server update is available.

 local modulename="Update"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 ### SteamCMD Update Checker ###

--- a/lgsm/functions/update_dl.sh
+++ b/lgsm/functions/update_dl.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description: Runs a server update.

 local modulename="Update"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_steamcmd_dl(){
 	cd "${rootdir}"
--- a/lgsm/functions/update_ts3.sh
+++ b/lgsm/functions/update_ts3.sh
@ -7,7 +7,7 @@ lgsm_version="210516"
 # Description:Handles updating of teamspeak 3 servers.

 local modulename="Update"
-function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
+local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"

 fn_update_ts3_dl(){
 	fn_fetch_file "http://dl.4players.de/ts/releases/${ts3_version_number}/teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2" "${lgsmdir}/tmp" "teamspeak3-server_linux_${ts3arch}-${ts3_version_number}.tar.bz2"