Browse Source

recompiled

no longer need fix file and fixed config locations
pull/2908/head
scott 5 years ago
parent
commit
403b62e389
  1. 4
      lgsm/config-default/config-lgsm/openttdserver/_default.cfg
  2. 5
      lgsm/functions/core_functions.sh
  3. 4
      lgsm/functions/fix.sh
  4. 10
      lgsm/functions/fix_openttd.sh
  5. 2
      lgsm/functions/install_server_files.sh

4
lgsm/config-default/config-lgsm/openttdserver/_default.cfg

@ -140,9 +140,9 @@ glibc="null"
## Game Server Directories
systemdir="${serverfiles}"
executabledir="${systemdir}/games"
executabledir="${serverfiles}"
executable="./openttd"
servercfgdir="${rootdir}/.openttd"
servercfgdir="${serverfiles}/.openttd"
servercfg="${selfname}.cfg"
servercfgdefault="openttd.cfg"
servercfgfullpath="${servercfgdir}/${servercfg}"

5
lgsm/functions/core_functions.sh

@ -727,11 +727,6 @@ functionfile="${FUNCNAME[0]}"
fn_fetch_function
}
fix_openttd.sh(){
functionfile="${FUNCNAME[0]}"
fn_fetch_function
}
# Calls code required for legacy servers
core_legacy.sh

4
lgsm/functions/fix.sh

@ -91,7 +91,7 @@ fi
# Fixes that are run on install only.
if [ "${commandname}" == "INSTALL" ]; then
if [ "${shortname}" == "av" ]||[ "${shortname}" == "cmw" ]||[ "${shortname}" == "kf" ]||[ "${shortname}" == "kf2" ]||[ "${shortname}" == "onset" ]||[ "${shortname}" == "ro" ]||[ "${shortname}" == "ut2k4" ]||[ "${shortname}" == "ut" ]||[ "${shortname}" == "ut3" ]||[ "${shortname}" == "openttd" ]; then
if [ "${shortname}" == "av" ]||[ "${shortname}" == "cmw" ]||[ "${shortname}" == "kf" ]||[ "${shortname}" == "kf2" ]||[ "${shortname}" == "onset" ]||[ "${shortname}" == "ro" ]||[ "${shortname}" == "ut2k4" ]||[ "${shortname}" == "ut" ]||[ "${shortname}" == "ut3" ]; then
echo -e ""
echo -e "Applying Post-Install Fixes"
echo -e "================================="
@ -111,8 +111,6 @@ if [ "${commandname}" == "INSTALL" ]; then
fix_ut.sh
elif [ "${shortname}" == "ut3" ]; then
fix_ut3.sh
elif [ "${shortname}" == "openttd" ]; then
fix_openttd.sh
else
fn_print_information_nl "No fixes required."
fi

10
lgsm/functions/fix_openttd.sh

@ -1,10 +0,0 @@
#!/bin/bash
# LinuxGSM fix_ottd.sh function
# Author: ttocszed00
# Website: https://linuxgsm.com
# Description: copys bundle to top level.
local modulename="FIX"
local commandaction="Fix"
mv "${serverfiles}/.openttd/*" "${rootdir}/.openttd"

2
lgsm/functions/install_server_files.sh

@ -63,7 +63,7 @@ fn_install_server_files(){
remote_fileurl="http://linuxgsm.download/ZombieMasterReborn/zombie_master_reborn_b5_2.tar.xz"; local_filedir="${tmpdir}"; local_filename="zombie_master_reborn_b5_2.tar.xz"; chmodx="nochmodx" run="norun"; force="noforce"; md5="4b9b9832e863d03981a40c26065792a6"
### Temp file hosting of compiled OpenTTD for Ubuntu 20.04 web site has builds for Ubuntu 16.04,18.04; Debian Stretch,Buster
elif [ "${shortname}" == "openttd" ]; then
remote_fileurl="https://downloads.zed.rip/openttd-1.10.1.zip"; local_filedir="${tmpdir}"; local_filename="openttd-1.10.1.zip"; chmodx="nochmodx"; run="norun"; force="noforce"; md5="b1de39f1ac6fee8c9d34754453c0442a"
remote_fileurl="https://downloads.zed.rip/openttd-1.10.1.zip"; local_filedir="${tmpdir}"; local_filename="openttd-1.10.1.zip"; chmodx="nochmodx"; run="norun"; force="noforce"; md5="da3d4c0ea5c2592ce48f01f6b3618218"
fi
fn_fetch_file "${remote_fileurl}" "" "" "" "${local_filedir}" "${local_filename}" "${chmodx}" "${run}" "${forcedl}" "${md5}"
fn_dl_extract "${local_filedir}" "${local_filename}" "${serverfiles}"

Loading…
Cancel
Save