Skip to content
Permalink
Browse files

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

  • Loading branch information...
dgibbs64 committed May 7, 2019
1 parent a705a31 commit 09fe43935cc74c9c14ef887bb01cf6c965041a8b
@@ -25,8 +25,6 @@ admins=""
## Advanced Server Start Settings
# Rollback server state (remove after start command)
loadsave=""
# Use unstable 64 bit server executable (O/1)
x64mode="0"

## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
# Edit with care | http://hurtworld.wikia.com/wiki/Hosting_A_Server
@@ -119,11 +117,7 @@ engine="unity3d"
## Server Specific Directories
systemdir="${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
backupdir="${rootdir}/backups"
@@ -143,4 +137,3 @@ postdetailslog="${lgsmlogdir}/${servicename}-postdetails.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"
consolelogdate="${consolelogdir}/${servicename}-console-$(date '+%Y-%m-%d-%H:%M:%S').log"

@@ -8,12 +8,9 @@

#### 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
# 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(){
parms="+exec ${servercfg}"
}
@@ -103,7 +100,7 @@ engine="idtech3_ql"
## Server Specific Directories
systemdir="${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"
servercfgdefault="server.cfg"
servercfgdir="${serverfiles}/baseq3"
@@ -101,11 +101,7 @@ engine="unity3d"
## Server Specific Directories
systemdir="${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"
servercfgdirdefault="${serverfiles}"
servercfgfullpathdefault="${servercfgdirdefault}/${servercfgdefault}"

0 comments on commit 09fe439

Please sign in to comment.
You can’t perform that action at this time.