Quellcode durchsuchen

feat(config): standardise 32/64 bit binary selection (#2339)

Daniel Gibbs vor 7 Jahren
Ursprung
Commit
09fe43935c

+ 1 - 8
lgsm/config-default/config-lgsm/hwserver/_default.cfg

@@ -25,8 +25,6 @@ admins=""
 ## Advanced Server Start Settings
 ## Advanced Server Start Settings
 # Rollback server state (remove after start command)
 # Rollback server state (remove after start command)
 loadsave=""
 loadsave=""
-# Use unstable 64 bit server executable (O/1)
-x64mode="0"
 
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # Edit with care | http://hurtworld.wikia.com/wiki/Hosting_A_Server
 # Edit with care | http://hurtworld.wikia.com/wiki/Hosting_A_Server
@@ -119,11 +117,7 @@ engine="unity3d"
 ## Server Specific Directories
 ## Server Specific Directories
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executabledir="${serverfiles}"
-if [ "${x64mode}" == "1" ]; then
-	executable="./Hurtworld.x86_64"
-else
-	executable="./Hurtworld.x86"
-fi
+executable=$([ "$(uname -m)" == "x86_64" ] && echo "./Hurtworld.x86_64" || echo "./Hurtworld.x86")
 
 
 ## Backup Directory
 ## Backup Directory
 backupdir="${rootdir}/backups"
 backupdir="${rootdir}/backups"
@@ -143,4 +137,3 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.log"
 gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"
 gamelogdate="${gamelogdir}/${servicename}-game-$(date '+%Y-%m-%d-%H:%M:%S').log"
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 lgsmlogdate="${lgsmlogdir}/${servicename}-script-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
 consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"
-

+ 2 - 5
lgsm/config-default/config-lgsm/qlserver/_default.cfg

@@ -8,12 +8,9 @@
 
 
 #### Server Settings ####
 #### Server Settings ####
 
 
-## Server Start Settings | https://docs.linuxgsm.com/configuration/start-parameters
-arch="x64" # x64 or x86
-
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 # Edit with care | Install/Config Guide : https://steamcommunity.com/sharedfiles/filedetails/?id=542966946
 # Edit with care | Install/Config Guide : https://steamcommunity.com/sharedfiles/filedetails/?id=542966946
-# Console Commands : http://www.regurge.at/ql/
+# Console Commands : http://www.regurge.at/ql
 fn_parms(){
 fn_parms(){
 parms="+exec ${servercfg}"
 parms="+exec ${servercfg}"
 }
 }
@@ -103,7 +100,7 @@ engine="idtech3_ql"
 ## Server Specific Directories
 ## Server Specific Directories
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executabledir="${serverfiles}"
-executable=$([ "${arch}" == 'x64' ] && echo "./run_server_x64.sh" || echo "./run_server_x86.sh")
+executable=$([ "$(uname -m)" == "x86_64" ] && echo "./run_server_x64.sh" || echo "./run_server_x86.sh")
 servercfg="${servicename}.cfg"
 servercfg="${servicename}.cfg"
 servercfgdefault="server.cfg"
 servercfgdefault="server.cfg"
 servercfgdir="${serverfiles}/baseq3"
 servercfgdir="${serverfiles}/baseq3"

+ 1 - 5
lgsm/config-default/config-lgsm/sdtdserver/_default.cfg

@@ -101,11 +101,7 @@ engine="unity3d"
 ## Server Specific Directories
 ## Server Specific Directories
 systemdir="${serverfiles}"
 systemdir="${serverfiles}"
 executabledir="${serverfiles}"
 executabledir="${serverfiles}"
-if [ "$(uname -m)" == "x86_64" ]; then
-	executable="./7DaysToDieServer.x86_64" 
-else
-	executable="./7DaysToDieServer.x86"
-fi	
+executable=$([ "$(uname -m)" == "x86_64" ] && echo "./7DaysToDieServer.x86_64" || echo "./7DaysToDieServer.x86")
 servercfgdefault="serverconfig.xml"
 servercfgdefault="serverconfig.xml"
 servercfgdirdefault="${serverfiles}"
 servercfgdirdefault="${serverfiles}"
 servercfgfullpathdefault="${servercfgdirdefault}/${servercfgdefault}"
 servercfgfullpathdefault="${servercfgdirdefault}/${servercfgdefault}"