Merge remote-tracking branch 'refs/remotes/origin/master' into travis-test

Arma3/arma3server

@@ -1,4 +1,3 @@
-
 #!/bin/bash
 # ARMA 3
 # Server Management Script

functions/fn_backup

@@ -2,7 +2,7 @@
 # LGSM fn_backup function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 210115
+# Version: 311015
 
 # Description: Creates a .tar.gz file in the backup directory.
 
@@ -22,7 +22,7 @@ while true; do
 	read -p "Continue? [y/N]" yn
 	case $yn in
 	[Yy]* ) break;;
-	[Nn]* ) echo Exiting; return 1;;
+	[Nn]* ) echo Exiting; return;;
 	* ) echo "Please answer yes or no.";;
 esac
 done

functions/fn_check_ip

@@ -2,7 +2,7 @@
 # LGSM fn_check_ip function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 120715
+# Version: 311015
 
 # Description: Automatically identifies the server interface IP.
 # If multiple interfaces are detected the user will need to manualy set using ip="0.0.0.0".
@@ -24,7 +24,7 @@ if [ "${ip}" == "0.0.0.0" ]||[ "${ip}" == "" ]; then
 		echo -en ""
 		echo -en "http://gameservermanagers.com/network-interfaces"
 		echo -en ""
-		exit
+		exit 1
 	else
 		ip=${getip}
 	fi

functions/fn_check_root

@@ -2,9 +2,9 @@
 # LGSM fn_check_root function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 210115
+# Version: 311015
 
 if [ $(whoami) = "root" ]; then
 	fn_printfailnl "Do NOT run this script as root!"
-	exit
+	exit 1
 fi

functions/fn_check_systemdir

@@ -2,9 +2,9 @@
 # LGSM fn_check_systemdir function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 210115
+# Version: 311015
 
 if [ ! -e "${systemdir}" ]; then
 	fn_printfailnl "Cannot access ${systemdir}: No such directory"
-	exit
+	exit 1
 fi

functions/fn_check_tmux

@@ -2,7 +2,7 @@
 # LGSM fn_check_tmux function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 291015
+# Version: 311015
 
 # Checks if tmux is installed as too many users do not RTFM or know how to use Google.
 
@@ -16,5 +16,5 @@ else
 	# Suitable passive agressive message
 	echo "	* Please see the the following link."
 	echo "	* http://gameservermanagers.com/tmux-not-found"
-	exit
+	exit 127
 fi

functions/fn_compress_unreal2maps

@@ -2,7 +2,7 @@
 # LGSM fn_compress_unreal2maps function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 210115
+# Version: 311015
 
 fn_check_root
 clear
@@ -20,7 +20,7 @@ while true; do
 	read -p "Start compression [y/N]" yn
 	case $yn in
 	[Yy]* ) break;;
-	[Nn]* ) echo Exiting; return 1;;
+	[Nn]* ) echo Exiting; return;;
 	* ) echo "Please answer yes or no.";;
 	esac
 done

functions/fn_compress_ut99maps

@@ -2,7 +2,7 @@
 # LGSM fn_compress_ut99maps function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 210115
+# Version: 311015
 
 fn_check_root
 clear
@@ -20,7 +20,7 @@ while true; do
 	read -p "Start compression [y/N]" yn
 	case $yn in
 	[Yy]* ) break;;
-	[Nn]* ) echo Exiting; return 1;;
+	[Nn]* ) echo Exiting; return;;
 	* ) echo "Please answer yes or no.";;
 	esac
 done

functions/fn_console

@@ -2,7 +2,7 @@
 # LGSM fn_console function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 260515
+# Version: 311015
 
 # Description: Gives access to the server tmux console.
 
@@ -20,7 +20,7 @@ while true; do
 	read -e -i "y" -p "Continue? [y/N]" yn
 	case $yn in
 	[Yy]* ) break;;
-	[Nn]* ) echo Exiting; return 1;;
+	[Nn]* ) echo Exiting; return;;
 	* ) echo "Please answer yes or no.";;
 esac
 done

functions/fn_debug

@@ -2,7 +2,7 @@
 # LGSM fn_debug function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 160415
+# Version: 311015
 
 # Description: Runs the server without tmux. Runs direct from the terminal.
 
@@ -37,7 +37,7 @@ while true; do
 	read -p "Continue? [y/N]" yn
 	case $yn in
 	[Yy]* ) break;;
-	[Nn]* ) echo Exiting; return 1;;
+	[Nn]* ) echo Exiting; return;;
 	* ) echo "Please answer yes or no.";;
 esac
 done

functions/fn_getopt

@@ -2,7 +2,7 @@
 # LGSM fn_getopt function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 200615
+# Version: 311015
 
 # Description: getopt arguments.
 
@@ -46,7 +46,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 	echo "Usage: $0 {start|stop|restart|update|force-update|update-functions|validate|monitor|email-test|details|backup|console|debug|install|auto-install}"
-	exit 1;;
 esac
 exit
 }
@@ -79,7 +78,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 		echo "Usage: $0 {start|stop|restart|update|update-functions|monitor|email-test|details|backup|install|auto-install}"
-		exit 1;;
 esac
 exit
 }
@@ -108,7 +106,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 		echo "Usage: $0 {start|stop|restart|update-functions|monitor|email-test|backup|console|debug}"
-		exit 1;;
 esac
 exit
 }
@@ -143,7 +140,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 	echo "Usage: $0 {start|stop|restart|update-functions|monitor|email-test|details|backup|console|debug|install|map-compressor}"
-	exit 1;;
 esac
 exit
 }
@@ -191,7 +187,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 	echo "Usage: $0 {start|stop|restart|update|update-functions|validate|monitor|email-test|details|backup|console|debug|install|auto-install|map-compressor}"
-	exit 1;;
 esac
 exit
 }
@@ -227,7 +222,6 @@ case "$getopt" in
 		fn_deps_detect;;		
 	*)
 	echo "Usage: $0 {start|stop|restart|update-functions|monitor|email-test|details|backup|console|debug|install|map-compressor}"
-	exit 1;;
 esac
 exit
 }

functions/fn_install_ts3

@@ -2,7 +2,7 @@
 # LGSM fn_install_ts3 function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 301015
+# Version: 311015
 
 fn_details_distro
 # Gets the teamspeak server architecture
@@ -12,7 +12,7 @@ elif [ "${arch}" == "i386" ]||[ "${arch}" == "i686" ]; then
 	ts3arch="x86"
 else
 	fn_printfailure "${arch} is an unsupported architecture"
-	exit
+	exit 1
 fi
 
 # Grabs all version numbers not in correct order
@@ -45,7 +45,7 @@ if [ -z "${availablebuild}" ]; then
 	sleep 1
 	fn_printfail "Checking for update: teamspeak.com: Not returning version info"
 	sleep 2
-	exit
+	exit 1
 fi
 
 cd "${rootdir}"
@@ -63,7 +63,7 @@ else
 	sleep 1
 	cat ".${servicename}-tar-error.tmp"
 	rm ".${servicename}-tar-error.tmp"
-	exit
+	exit $?
 fi
 echo -e "copying to ${filesdir}...\c"
 cp -R "${rootdir}/teamspeak3-server_linux-${ts3arch}/"* "${filesdir}" 2> ".${servicename}-cp-error.tmp"
@@ -75,7 +75,7 @@ else
 	sleep 1
 	cat ".${servicename}-cp-error.tmp"
 	rm ".${servicename}-cp-error.tmp"
-	exit
+	exit $?
 fi
 rm -f teamspeak3-server_linux-${ts3arch}-${availablebuild}.tar.gz
 rm -rf "${rootdir}/teamspeak3-server_linux-${ts3arch}"

functions/fn_monitor

@@ -2,7 +2,7 @@
 # LGSM fn_monitor function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 150815
+# Version: 311015
 
 # Description: Monitors server by checking for running proccesses
 # then passes to fn_monitor_query.
@@ -22,7 +22,7 @@ if [ ! -f "${rootdir}/${lockselfname}" ]; then
 	sleep 1
 	echo -en "\n"
 	echo "To enable monitor run ./${selfname} start"
-	exit
+	exit 1
 fi
 fn_printdots "Checking session: CHECKING"
 fn_scriptlog "Checking session: CHECKING"
@@ -67,7 +67,7 @@ if [ ! -f "${rootdir}/${lockselfname}" ]; then
 	sleep 1
 	echo -en "\n"
 	echo "To enable monitor run ./${selfname} start"
-	exit
+	exit 1
 fi
 
 updatecheck=$(ps -ef|grep "${selfname} update"|grep -v grep|wc -l)
@@ -85,7 +85,7 @@ if [ "${updatecheck}" = "0" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "$
 		if [ "${engine}" == "avalanche" ]||[ "${engine}" == "goldsource" ]||[ "${engine}" == "realvirtuality" ]||[ "${engine}" == "source" ]||[ "${engine}" == "spark" ]||[ "${engine}" == "unity3d" ]||[ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then
 			fn_monitor_query
 		fi
-		exit
+		exit $?
 	else
 		fn_printfail "Checking session: FAIL"
 		fn_scriptlog "Checking session: FAIL"

functions/fn_monitor_query

@@ -2,7 +2,7 @@
 # LGSM fn_monitor_query function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 301015
+# Version: 311015
 
 # Description: uses gsquery.py to directly query the server.
 # Detects if the server has frozen.
@@ -56,7 +56,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then
 			fn_email
 		fi
 		fn_restart
-		exit
+		exit 1
 	elif [ "${exitcode}" == "0" ]; then
 		fn_printok "Querying port: ${ip}:${port} : OK"
 		fn_scriptlog "Querying port: ${ip}:${port} : OK"
@@ -79,7 +79,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then
 			echo "As user ${owner} or root run the following command."
 			whoami=$(whoami)
 			echo -en "\nchown ${whoami}:${whoami} ${rootdir}/gsquery.py\n\n"
-		exit
+		exit 1
 		fi
 	else
 		fn_printfail "Querying port: ${ip}:${port} : UNKNOWN ERROR"
@@ -87,7 +87,7 @@ if [ -f "${rootdir}/gsquery.py" ]; then
 		sleep 1
 		echo -en "\n"
 		${rootdir}/gsquery.py -a ${ip} -p ${port} -e ${engine}
-		exit
+		exit 1
 	fi
 else
 	fn_printfailnl "Could not find ${rootdir}/gsquery.py"

functions/fn_update_check

@@ -2,7 +2,7 @@
 # LGSM fn_update_check function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 301015
+# Version: 311015
 
 # Description: Checks if a server update is available.
 
@@ -40,7 +40,7 @@ if [ "${appmanifestfilewc}" -ge "2" ]; then
 		for appfile in ${appmanifestfile}; do
 			echo "	${appfile}"
 		done
-		exit
+		exit 1
 	else
 		sleep 1
 		fn_printok "Removed x${appmanifestfilewc1} appmanifest_${appid}.acf files"
@@ -56,7 +56,7 @@ elif [ "${appmanifestfilewc}" -eq "0" ]; then
 	if [ "${forceupdate}" -eq "1" ]; then
 		fn_printfail "Still no appmanifest_${appid}.acf found: Unable to update"
 		fn_scriptlog "Warning! Still no appmanifest_${appid}.acf found: Unable to update"
-		exit
+		exit 1
 	fi
 	forceupdate=1
 	fn_printwarn "No appmanifest_${appid}.acf found"
@@ -128,7 +128,7 @@ if [ -z "${availablebuild}" ]; then
 	sleep 1
 	fn_printfailnl "Checking for update: SteamCMD: Not returning version info"
 	fn_scriptlog "Failure! Checking for update: SteamCMD: Not returning version info"
-	exit
+	exit 1
 else
 	fn_printok "Checking for update: SteamCMD"
 	fn_scriptlog "Success! Checking for update: SteamCMD"
@@ -205,7 +205,7 @@ if [ -z "$(find ./* -name 'ts3server*_0.log')" ]; then
 	if [ -z "$(find ./* -name 'ts3server*_0.log')" ]; then
 		fn_printfailnl "Checking for update: teamspeak.com: Still No logs with server version found"
 		fn_scriptlog "Failure! Checking for update: teamspeak.com: Still No logs with server version found"
-		exit
+		exit 1
 	fi
 fi
 currentbuild=$(cat $(find ./* -name 'ts3server*_0.log' 2> /dev/null | sort | egrep -E -v '${rootdir}/.ts3version' | tail -1) | egrep -o 'TeamSpeak 3 Server ((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}' | egrep -o '((\.)?[0-9]{1,3}){1,3}\.[0-9]{1,3}')
@@ -245,7 +245,7 @@ if [ -z "${availablebuild}" ]; then
 	fn_printfail "Checking for update: teamspeak.com: Not returning version info"
 	fn_scriptlog "Failure! Checking for update: teamspeak.com: Not returning version info"
 	sleep 2
-	exit
+	exit 1
 else
 	fn_printok "Checking for update: teamspeak.com"
 	fn_scriptlog "Success! Checking for update: teamspeak.com"

functions/fn_update_dl

@@ -2,7 +2,7 @@
 # LGSM fn_update_dl function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-# Version: 040715
+# Version: 311015
 
 # Description: Runs a server update.
 
@@ -66,7 +66,7 @@ else
 	cat "${scriptlogdir}/.${servicename}-tar-error.tmp" >> "${scriptlog}"
 	rm "${scriptlogdir}/.${servicename}-tar-error.tmp"
 	fn_scriptlog "Failure! Unable to update"
-	exit
+	exit ${status}
 fi
 echo -e "copying to ${filesdir}...\c"
 fn_scriptlog "Copying to ${filesdir}"
@@ -82,7 +82,7 @@ else
 	cat "${scriptlogdir}/.${servicename}-cp-error.tmp" >> "${scriptlog}"
 	rm "${scriptlogdir}/.${servicename}-cp-error.tmp"
 	fn_scriptlog "Failure! Unable to update"
-	exit
+	exit ${status}
 fi
 rm -f teamspeak3-server_linux-${ts3arch}-${availablebuild}.tar.gz
 rm -rf "${rootdir}/teamspeak3-server_linux-${ts3arch}"