Просмотр исходного кода

Merge remote-tracking branch 'upstream/master' into config-select

Ilija Matoski 11 лет назад
Родитель
Сommit
c981c7fe84
2 измененных файлов с 9 добавлено и 6 удалено
  1. 5 2
      Arma3/arma3server
  2. 4 4
      functions/fn_start

+ 5 - 2
Arma3/arma3server

@@ -4,7 +4,7 @@
 # Author: Daniel Gibbs
 # Contributor: Scarsz
 # Website: http://danielgibbs.co.uk
-# Version: 200315
+# Version: 240415
 
 #### Variables ####
 
@@ -27,7 +27,7 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
 #### Advanced Variables ####
 
 # ARMA 3 Modules
-# add mods with relative paths: 
+# add mods with relative paths:
 # mods/\@CBA_A3\;
 # or several mods as:
 # mods/\@CBA_A3\;mods/\@task_force_radio
@@ -35,7 +35,10 @@ parms="-netlog -ip=${ip} -cfg=${networkcfgfullpath} -config=${servercfgfullpath}
 mods=""
 
 # Steam
+# Stable
 appid="233780"
+# Development
+# appid="233780 -beta development"
 
 # Server Details
 servicename="arma3-server"

+ 4 - 4
functions/fn_start

@@ -166,10 +166,10 @@ if [ "${tmuxwc}" -eq 0 ]; then
 				fn_scriptlog "http://gameservermanagers.com/issues"
 			fi
 		fi
-	else
-		fn_printok "${servername}"
-		fn_scriptlog "Started ${servername}"
 	fi
+else
+	fn_printok "${servername}"
+	fn_scriptlog "Started ${servername}"	
 fi
 #rm "${scriptlogdir}/.${servicename}-tmux-error.tmp"
 echo -en "\n"
@@ -179,4 +179,4 @@ if [ "${gamename}" == "Teamspeak 3" ]; then
 	fn_start_teamspeak3
 else
 	fn_start_tmux
-fi
+fi