فهرست منبع

Merge branch 'master' into develop

Daniel Gibbs 8 سال پیش
والد
کامیت
195e01cc61
3فایلهای تغییر یافته به همراه14 افزوده شده و 2 حذف شده
  1. 8 0
      ISSUE_TEMPLATE.md
  2. 1 1
      lgsm/config-default/config-lgsm/arma3server/_default.cfg
  3. 5 1
      lgsm/functions/update_factorio.sh

+ 8 - 0
ISSUE_TEMPLATE.md

@@ -0,0 +1,8 @@
+Please select the "Preview" tab above to view this message correctly.
+
+Please note that this is an issue tracker for **LinuxGSM** related bugs and feature requests and **not** for the games themselves.
+
+**Therefore personal server issues on GitHub will be closed without a kiss.**
+
+Please follow **[this article](https://github.com/GameServerManagers/LinuxGSM/wiki/Support)** for optimal assistance
+and do not forget to remove this text before opening the issue.

+ 1 - 1
lgsm/config-default/config-lgsm/arma3server/_default.cfg

@@ -33,7 +33,7 @@ bepath=""
 
 ## Server Start Command | https://github.com/GameServerManagers/LinuxGSM/wiki/Start-Parameters#additional-parameters
 fn_parms(){
-parms="-netlog -ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
+parms="-ip=${ip} -port=${port} -cfg=${networkcfgfullpath} -config=${servercfgfullpath} -mod=${mods} -servermod=${servermods} -bepath=${bepath} -autoinit -loadmissiontomemory"
 }
 
 #### LinuxGSM Settings ####

+ 5 - 1
lgsm/functions/update_factorio.sh

@@ -76,7 +76,11 @@ fn_update_factorio_arch(){
 
 fn_update_factorio_availablebuild(){
 	# Gets latest build info.
-	availablebuild=$(${curlpath} -s https://www.factorio.com/download-headless/"${branch}" | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
+	if [ "${branch}" ]; then
+		availablebuild=$(${curlpath} -s https://www.factorio.com/download-headless/"${branch}" | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
+	else
+		availablebuild=$(${curlpath} -s https://www.factorio.com/download-headless | grep 'headless/linux64' | head -n 1 | grep -oP '(?<=get-download/).*?(?=/)')
+	fi
 	sleep 1
 
 	# Checks if availablebuild variable has been set