diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver index c735d87ae..58840fd0f 100644 --- a/ARKSurvivalEvolved/arkserver +++ b/ARKSurvivalEvolved/arkserver @@ -48,8 +48,8 @@ parms="\"TheIsland?listen?MultiHome=${ip}?SessionName=${servername}?MaxPlayers=$ # Github Branch Select # Allows for the use of different function files # from a different repo and/or branch. -githubuser="dgibbs64" -githubrepo="linuxgsm" +githubuser="GameServerManagers" +githubrepo="LinuxGSM" githubbranch="master" # Steam diff --git a/Arma3/arma3server b/Arma3/arma3server index 9f4c64e03..70039ba37 100644 --- a/Arma3/arma3server +++ b/Arma3/arma3server @@ -59,8 +59,8 @@ bepath="" # Github Branch Select # Allows for the use of different function files # from a different repo and/or branch. -githubuser="dgibbs64" -githubrepo="linuxgsm" +githubuser="GameServerManagers" +githubrepo="LinuxGSM" githubbranch="master" # Steam diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver index 7aceb5515..9250d2a5b 100644 --- a/BlackMesa/bmdmserver +++ b/BlackMesa/bmdmserver @@ -53,8 +53,8 @@ parms="-game bms -strictportbind -ip ${ip} -port ${port} +clientport ${clientpor # Github Branch Select # Allows for the use of different function files # from a different repo and/or branch. -githubuser="dgibbs64" -githubrepo="linuxgsm" +githubuser="GameServerManagers" +githubrepo="LinuxGSM" githubbranch="master" # Steam diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 3d81e418b..98d61cb15 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -120,7 +120,7 @@ fn_check_loop(){ fn_deps_detector done - # user to be informaed of any missing dependecies + # user to be informed of any missing dependencies fn_found_missing_deps } @@ -128,7 +128,7 @@ info_distro.sh if [ "${function_selfname}" == "command_install.sh" ]; then echo "" - echo "Checking Dependecies" + echo "Checking Dependencies" echo "=================================" fi @@ -188,6 +188,9 @@ if [ -n "$(command -v dpkg-query)" ]; then else array_deps_required+=( libsdl1.2debian bzip2 ) fi + # Unreal Tournament + elif [ "${gamename}" == "Unreal Tournament" ]; then + array_deps_required+=( unzip ) fi fn_deps_email fn_check_loop @@ -243,6 +246,9 @@ elif [ -n "$(command -v yum)" ]; then else array_deps_required+=( SDL.i686 bzip2 ) fi + # Unreal Tournament + elif [ "${gamename}" == "Unreal Tournament" ]; then + array_deps_required+=( unzip ) fi fn_deps_email fn_check_loop diff --git a/lgsm/functions/command_install.sh b/lgsm/functions/command_install.sh index a197eae29..94b597aae 100644 --- a/lgsm/functions/command_install.sh +++ b/lgsm/functions/command_install.sh @@ -18,7 +18,7 @@ check_deps.sh if [ "${gamename}" == "Unreal Tournament 2004" ]; then install_server_files.sh install_ut2k4_key.sh -elif [ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]; then +elif [ "${gamename}" == "Enemy Territory" ]||[ "${gamename}" == "Minecraft" ]||[ "${gamename}" == "Mumble" ]||[ "${gamename}" == "TeamSpeak 3" ]||[ "${gamename}" == "Unreal Tournament 99" ]||[ "${gamename}" == "Unreal Tournament" ]; then installer=1 install_server_files.sh elif [ -n "${appid}" ]; then diff --git a/lgsm/functions/core_dl.sh b/lgsm/functions/core_dl.sh index 8f41bdea0..e6e563fc7 100644 --- a/lgsm/functions/core_dl.sh +++ b/lgsm/functions/core_dl.sh @@ -44,7 +44,7 @@ fn_dl_md5(){ fi } -# Extracts bzip2 or gzip files +# Extracts bzip2 or gzip or zip files # Extracts can be defined in code like so: # fn_dl_extract "${filedir}" "${filename}" "${extractdir}" # fn_dl_extract "/home/gameserver/lgsm/tmp" "file.tar.bz2" "/home/gamserver/serverfiles" @@ -61,6 +61,8 @@ fn_dl_extract(){ tarcmd=$(tar -zxf "${filedir}/${filename}" -C "${extractdir}") elif [ "${mime}" == "application/x-bzip2" ]; then tarcmd=$(tar -jxf "${filedir}/${filename}" -C "${extractdir}") + elif [ "${mime}" == "application/zip" ]; then + tarcmd=$(unzip -d "${extractdir}" "${filedir}/${filename}") fi local exitcode=$? if [ ${exitcode} -ne 0 ]; then diff --git a/lgsm/functions/core_functions.sh b/lgsm/functions/core_functions.sh index 423975fcb..73f8bd44d 100644 --- a/lgsm/functions/core_functions.sh +++ b/lgsm/functions/core_functions.sh @@ -322,6 +322,10 @@ functionfile="${FUNCNAME}" fn_fetch_function } +fix_ut.sh(){ +functionfile="${FUNCNAME}" +fn_fetch_function +} # Info diff --git a/lgsm/functions/info_glibc.sh b/lgsm/functions/info_glibc.sh index 5aa16cbd7..8e4c1a4b8 100644 --- a/lgsm/functions/info_glibc.sh +++ b/lgsm/functions/info_glibc.sh @@ -83,6 +83,15 @@ elif [ "${engine}" == "unreal4" ]; then elif [ "${engine}" == "unity3d" ]; then glibcrequired="2.15" glibcfix="no" +elif [ "${gamename}" == "TeamSpeak 3" ]; then + glibcrequired="NOT REQUIRED" + glibcfix="no" +elif [ "${gamename}" == "Mumble" ]; then + glibcrequired="NOT REQUIRED" + glibcfix="no" +elif [ "${engine}" == "idtech3" ]; then + glibcrequired="2.0" + glibcfix="no" else glibcrequired="UNKNOWN" glibcfix="no" diff --git a/lgsm/functions/install_config.sh b/lgsm/functions/install_config.sh index cf2953958..ed557e6eb 100644 --- a/lgsm/functions/install_config.sh +++ b/lgsm/functions/install_config.sh @@ -36,7 +36,7 @@ fn_userinputconfig(){ fn_script_log_info "changing rconpassword." sed -i "s/\"\"/\"${rconpass}\"/g" "${servercfgfullpath}" sleep 1 - } +} fn_arma3config(){ fn_defaultconfig @@ -165,6 +165,30 @@ fn_unreal2config(){ echo "" } +fn_unrealtournament(){ + # allow user to input server name and password + if [ -z "${autoinstall}" ]; then + echo "" + echo "Configuring ${gamename} Server" + echo "=================================" + sleep 1 + read -p "Enter server name: " servername + read -p "Enter rcon password: " rconpass + else + servername="${servicename}" + rconpass="rconpassword" + fi + echo "changing hostname." + fn_script_log_info "changing hostname." + sed -i "s/\"\"/\"${servername}\"/g" "${servercfgdir}/Game.ini" + sleep 1 + echo "changing rconpassword." + fn_script_log_info "changing rconpassword." + sed -i "s/\"\"/\"${rconpass}\"/g" "${servercfgdir}/Engine.ini" + sleep 1 + +} + echo "" if [ "${gamename}" != "Hurtworld" ]; then echo "Creating Configs" @@ -257,6 +281,13 @@ elif [ "${gamename}" == "Double Action: Boogaloo" ]; then fn_sourceconfig elif [ "${gamename}" == "Empires Mod" ]; then fn_defaultconfig +elif [ "${gamename}" == "Enemy Territory" ]; then + echo -e "downloading lgsm-default.cfg...\c" + wget -N /dev/null ${githuburl}/EnemyTerritory/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 + fn_defaultconfig + fn_userinputconfig + echo "" elif [ "${gamename}" == "Fistful of Frags" ]; then echo -e "downloading lgsm-default.cfg...\c" wget -N /dev/null ${githuburl}/FistfulOfFrags/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq @@ -387,6 +418,13 @@ elif [ "${gamename}" == "Terraria" ]; then wget -N /dev/null ${githuburl}/Terraria/cfg/lgsm-default.txt 2>&1 | grep -F HTTP | cut -c45- | uniq sleep 1 fn_defaultconfig +elif [ "${gamename}" == "Unreal Tournament" ]; then + echo -e "downloading Engine.ini...\c" + wget -N /dev/null ${githuburl}/UnrealTournament/cfg/Engine.ini 2>&1 | grep -F HTTP | cut -c45- | uniq + echo -e "downloading Game.ini...\c" + wget -N /dev/null ${githuburl}/UnrealTournament/cfg/Game.ini 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 + fn_unrealtournament elif [ "${gamename}" == "Unreal Tournament 2004" ]; then fn_unreal2config elif [ "${gamename}" == "Unreal Tournament 99" ]; then diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 9c9604253..bb6eede20 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -13,6 +13,10 @@ fn_install_server_files(){ fileurl="https://gameservermanagers.com/files/UnrealTournament99/ut99-server-451-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut99-server-451-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="49cb24d0550ff6ddeaba6007045c6edd" elif [ "${gamename}" == "Unreal Tournament 2004" ]; then fileurl="https://gameservermanagers.com/files/UnrealTournament2004/ut2004-server-3339-ultimate-linux.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="ut2004-server-3339-ultimate-linux.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="67c5e2cd9c2a4b04f163962ee41eff54" + elif [ "${gamename}" == "Enemy Territory" ]; then + fileurl="https://s3.amazonaws.com/linuxgsm/enemy-territory.260b.tar.gz"; filedir="${lgsmdir}/tmp"; filename="enemy-territory.260b.tar.gz"; executecmd="noexecute" run="norun"; force="noforce"; md5="ded32053e470fe15d9403ec4a0ab7e89" + elif [ "${gamename}" == "Unreal Tournament" ]; then + fileurl="https://s3.amazonaws.com/unrealtournament/UnrealTournament-Server-XAN-3045522-Linux.zip"; filedir="${lgsmdir}/tmp"; filename="UnrealTournament-Server-XAN-3045522-Linux.zip"; executecmd="noexecute" run="norun"; force="noforce"; md5="553fed5645a9fc623e92563049bf79f6" elif [ "${gamename}" == "GoldenEye: Source" ]; then fileurl="https://gameservermanagers.com/files/GoldenEyeSource/goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2"; filedir="${lgsmdir}/tmp"; filename="goldenEye_source_v4.2.4_server_2015_map_pack.tar.bz2"; executecmd="noexecute" run="norun"; force="noforce"; md5="3148ac38acc3642b0d6d64f51f27de15" fi