diff --git a/lgsm/config-default/config-lgsm/openttdserver/_default.cfg b/lgsm/config-default/config-lgsm/openttdserver/_default.cfg index 56be47bdd..48d220053 100644 --- a/lgsm/config-default/config-lgsm/openttdserver/_default.cfg +++ b/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}" diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index fb7feec53..4e87d494b 100644 --- a/lgsm/functions/core_functions.sh +++ b/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 diff --git a/lgsm/functions/fix.sh b/lgsm/functions/fix.sh index f1bc3e6bc..a42f0e51d 100644 --- a/lgsm/functions/fix.sh +++ b/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 diff --git a/lgsm/functions/fix_openttd.sh b/lgsm/functions/fix_openttd.sh deleted file mode 100644 index 4998f389a..000000000 --- a/lgsm/functions/fix_openttd.sh +++ /dev/null @@ -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" diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index a7a184704..945528d07 100644 --- a/lgsm/functions/install_server_files.sh +++ b/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}"