Initial renaming

creating new branch to test renaming

CounterStrikeGlobalOffensive/csgoserver

@@ -155,7 +155,4 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-fn_functions
-
-getopt=$1
-fn_getopt
+core_functions.sh

functions/check.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+# LGSM fn_check function
+# Author: Daniel Gibbs
+# Website: http://gameservermanagers.com
+lgsm_version="201215"
+
+# Description: Overall function for managing checks.
+# Runs checks that will either halt on or fix an issue.
+
+fn_module_compare() {
+  local e
+  for e in "${@:2}"; do [[ "$e" == "$1" ]] && return 0; done
+  return 1
+}
+
+
+check_root.sh
+
+if [ "${module}" != "install" ]; then
+	check_executable.sh
+fi
+
+no_check_logs=( details install map-compressor)
+fn_module_compare "${module}" "${no_check_logs[@]}"
+if [ $? != 0 ]; then
+	fn_check_logs
+fi
+
+
+fn_check_ip
+fn_check_steamcmd
+fn_check_steamuser
+fn_check_tmux
+
+fn_check_ts3status # may need to move out of checks

functions/fn_check_root → functions/check_root.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# LGSM fn_check_root function
+# LGSM check_root.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
 lgsm_version="061115"

functions/fn_check_systemdir → functions/check_systemdir.sh

@@ -4,7 +4,7 @@
 # Website: http://gameservermanagers.com
 lgsm_version="061115"
 
-if [ ! -e "${systemdir}" ]; then
+if [ ! -f "${systemdir}" ]; then
 	fn_printfailnl "Cannot access ${systemdir}: No such directory"
 	exit 1
 fi

functions/fn_backup → functions/command_backup.sh

@@ -7,7 +7,7 @@ lgsm_version="201215"
 # Description: Creates a .tar.gz file in the backup directory.
 
 local modulename="Backup"
-fn_check_root
+check_root.sh
 fn_check_systemdir
 backupname="${servicename}-$(date '+%Y-%m-%d-%H%M%S')"
 echo ""

functions/fn_console → functions/command_console.sh

@@ -7,7 +7,7 @@ lgsm_version="061115"
 # Description: Gives access to the server tmux console.
 
 local modulename="Console"
-fn_check_root
+check_root.sh
 fn_check_systemdir
 echo ""
 echo "${gamename} Console"

functions/fn_debug → functions/command_debug

@@ -7,7 +7,7 @@ lgsm_version="061115"
 # Description: Runs the server without tmux. Runs direct from the terminal.
 
 local modulename="Debug"
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_check_ip
 fn_check_logs

functions/command_debug.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+# LGSM fn_debug function
+# Author: Daniel Gibbs
+# Website: http://gameservermanagers.com
+lgsm_version="061115"
+
+# Description: Runs the server without tmux. Runs direct from the terminal.
+
+local modulename="Debug"
+check_root.sh
+fn_check_systemdir
+fn_check_ip
+fn_check_logs
+fn_details_distro
+fn_parms
+echo ""
+echo "${gamename} Debug"
+echo "============================"
+echo ""
+echo -e "Distro: ${os}"
+echo -e "Arch: ${arch}"
+echo -e "Kernel: ${kernel}"
+echo -e "Hostname: $HOSTNAME"
+echo ""
+echo "Start parameters:"
+if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]; then
+	echo "${executable} ${parms} -debug"
+else
+	echo "${executable} ${parms}"
+fi
+echo ""
+echo -e "Use for identifying server issues only!"
+echo -e "Press CTRL+c to drop out of debug mode."
+fn_printwarningnl "If ${servicename} is already running it will be stopped."
+echo ""
+while true; do
+	read -e -i "y" -p "Continue? [Y/n]" yn
+	case $yn in
+	[Yy]* ) break;;
+	[Nn]* ) echo Exiting; return;;
+	* ) echo "Please answer yes or no.";;
+esac
+done
+fn_scriptlog "Starting debug"
+fn_printinfonl "Stopping any running servers"
+fn_scriptlog "Stopping any running servers"
+sleep 1
+fn_stop
+fn_printdots "Starting debug"
+sleep 1
+fn_printok "Starting debug"
+fn_scriptlog "Started debug"
+sleep 1
+echo -en "\n"
+cd "${executabledir}"
+if [ "${engine}" == "source" ]||[ "${engine}" == "goldsource" ]; then
+	if [ "${gamename}" == "Counter Strike: Global Offensive" ]; then
+		startfix=1
+		fn_csgofix
+	elif [ "${gamename}" == "Insurgency" ]; then
+		fn_insfix
+	elif [ "${gamename}" == "ARMA 3" ]; then
+		fn_arma3fix	
+	fi
+	${executable} ${parms} -debug
+else
+	${executable} ${parms}
+fi

functions/fn_install → functions/command_install.sh

@@ -4,7 +4,7 @@
 # Website: http://gameservermanagers.com
 lgsm_version="201215"
 
-fn_check_root
+check_root.sh
 fn_install_header
 fn_install_serverdir
 

functions/fn_monitor → functions/command_monitor.sh

@@ -10,7 +10,7 @@ lgsm_version="061115"
 local modulename="Monitor"
 
 fn_monitor_teamspeak3(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_logs
 fn_printdots "${servername}"
@@ -54,7 +54,7 @@ fn_restart
 }
 
 fn_monitor_tmux(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_check_ip
 fn_details_config

functions/fn_start → functions/command_start.sh

@@ -9,7 +9,7 @@ lgsm_version="201215"
 local modulename="Starting"
 
 fn_start_teamspeak3(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_check_logs
 fn_check_ts3status
@@ -73,7 +73,7 @@ echo -en "\n"
 }
 
 fn_start_tmux(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_check_ip
 fn_check_logs

functions/fn_stop → functions/command_stop.sh

@@ -29,7 +29,7 @@ sdtd_telnet(){
 }
 
 fn_stop_teamspeak3(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_printdots "${servername}"
 fn_scriptlog "${servername}"
@@ -50,7 +50,7 @@ echo -en "\n"
 }
 
 fn_stop_tmux(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_details_config
 fn_printdots "${servername}"

functions/fn_compress_unreal2maps → functions/compress_unreal2_maps.sh

@@ -4,7 +4,7 @@
 # Website: http://gameservermanagers.com
 lgsm_version="061115"
 
-fn_check_root
+check_root.sh
 clear
 echo "${gamename} Map Compressor"
 echo "============================"

functions/fn_compress_ut99maps → functions/compress_ut99_maps.sh

@@ -4,7 +4,7 @@
 # Website: http://gameservermanagers.com
 lgsm_version="061115"
 
-fn_check_root
+check_root.sh
 clear
 echo "${gamename} Map Compressor"
 echo "============================"

functions/fn_functions → functions/core_functions.sh

@@ -27,7 +27,7 @@ functionfile="${FUNCNAME}"
 fn_runfunction
 }
 
-fn_check_root(){
+check_root.sh(){
 functionfile="${FUNCNAME}"
 fn_runfunction
 }

functions/fn_messages → functions/core_messages.sh

@@ -145,4 +145,7 @@ fn_printokeol(){
 # FAIL for end of line
 fn_printfaileol(){
 	echo -e "\e[0;31mFAIL\e[0m\n"
-}
+}
+
+getopt=$1
+core_getopt.sh

functions/fn_deps_detect → functions/dev_detect_deps.sh

@@ -7,7 +7,7 @@ lgsm_version="201215"
 # Description: Detects dependencies the server binary requires.
 
 local modulename="Backup"
-fn_check_root
+check_root.sh
 fn_check_systemdir
 cd "${executabledir}"
 if [ "${executable}" ==  "./hlds_run" ]; then

functions/fn_email_test → functions/email_test.sh

@@ -7,7 +7,7 @@ lgsm_version="061115"
 # Description: Sends a test email notification.
 
 local modulename="Email"
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_details_config
 if [ "${emailnotification}" = "on" ]; then

functions/fn_update_dl → functions/update_dl.sh

@@ -9,7 +9,7 @@ lgsm_version="061115"
 local modulename="Update"
 
 fn_steamcmd_dl(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_details_config
 fn_printdots "Updating ${servername}"
@@ -39,7 +39,7 @@ fi
 }
 
 fn_teamspeak3_dl(){
-fn_check_root
+check_root.sh
 fn_check_systemdir
 fn_details_config
 fn_printdots "Updating ${servername}"