diff --git a/functions/fn_getquery b/functions/fn_getquery index bfbbc124a..599b8d7f1 100644 --- a/functions/fn_getquery +++ b/functions/fn_getquery @@ -2,12 +2,12 @@ # LGSM fn_getquery function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 231214 +# Version: 241214 fn_dlgsquery(){ cd "${rootdir}" -echo -e "downloading lgsm-default.cfg...\c" -wget --no-check-certificate /dev/null "http://danielgibbs.co.uk/dl/gsquery.py" 2>&1 | grep -F "HTTP" | grep -v "Moved Permanently" | cut -c45- +echo -e "downloading gsquery.py...\c" +wget -N --no-check-certificate /dev/null "http://danielgibbs.co.uk/dl/gsquery.py" 2>&1 | grep -F "HTTP" | grep -v "Moved Permanently" | cut -c45- | uniq chmod +x gsquery.py } diff --git a/functions/fn_header b/functions/fn_header index 6ed038a43..d7caaed0d 100644 --- a/functions/fn_header +++ b/functions/fn_header @@ -2,7 +2,7 @@ # LGSM fn_header function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 011214 +# Version: 241214 clear echo "=================================" @@ -15,5 +15,4 @@ elif [ "${gamename}" == "Left 4 Dead" ]; then echo "contributions by Summit Singh Thakur" fi echo "http://danielgibbs.co.uk" -echo "=================================" -echo "" \ No newline at end of file +echo "=================================" \ No newline at end of file diff --git a/functions/fn_rootcheck b/functions/fn_rootcheck index ca3f7d3e2..be99de9d3 100644 --- a/functions/fn_rootcheck +++ b/functions/fn_rootcheck @@ -2,9 +2,9 @@ # LGSM fn_rootcheck function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 011214 +# Version: 241214 if [ $(whoami) = "root" ]; then - fn_printfailnl "Script will not run as root!" + fn_printfailnl "Do NOT run this script as root!" exit fi \ No newline at end of file diff --git a/functions/fn_serverconfig b/functions/fn_serverconfig index 290061c4b..96f0b90bb 100644 --- a/functions/fn_serverconfig +++ b/functions/fn_serverconfig @@ -2,23 +2,15 @@ # LGSM fn_serverconfig function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 211214 +# Version: 241214 fn_arma3config(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 cp -v lgsm-default.cfg "${servercfgfullpath}" sleep 1 echo "" } fn_goldsourceconfig(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 echo "creating ${servicename}.cfg config file." cp -v lgsm-default.cfg "${servercfgfullpath}" sleep 1 @@ -51,10 +43,6 @@ echo "" } fn_jc2config(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 cd "${filesdir}" cp -v default_config.lua config.lua sleep 1 @@ -62,20 +50,12 @@ echo "" } fn_serious3config(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 cp -v lgsm-default.ini ${servercfg} sleep 1 echo "" } fn_sourceconfig(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 echo "creating ${servicename}.cfg config file." cp -v lgsm-default.cfg "${servercfgfullpath}" sleep 1 @@ -103,9 +83,6 @@ echo "" } fn_ut99config(){ -echo "Loading Configs" -echo "=================================" -sleep 1 echo "${defaultcfg} > ${systemdir}/${ini}" tr -d '\r' < "${defaultcfg}" > "${systemdir}/${ini}" sleep 1 @@ -123,19 +100,12 @@ echo "" } fn_unity3dconfig(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 cp -v serverconfig.xml ${servercfg} sleep 1 +echo "" } fn_unreal2config(){ -echo "" -echo "Loading Configs" -echo "=================================" -sleep 1 cp -v "${defaultcfg}" "${systemdir}/${ini}" sleep 1 echo "" @@ -158,84 +128,115 @@ echo "" } echo "" -echo "Downloading lgsm-default.cfg" +echo "Creating Configs" echo "=================================" sleep 1 cd "${servercfgdir}" - - if [ "${gamename}" == "7 Days To Die" ]; then fn_unity3dconfig elif [ "${gamename}" == "ARMA 3" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Arma3/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Arma3/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_arma3config elif [ "${gamename}" == "Blade Symphony" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/BladeSymphony/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/BladeSymphony/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Counter Strike 1.6" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrike/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrike/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Counter Strike: Condition Zero" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeConditionZero/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeConditionZero/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Counter Strike: Global Offensive" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeGlobalOffensive/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeGlobalOffensive/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Counter Strike: Source" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeSource/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/CounterStrikeSource/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Day of Defeat" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/DayOfDefeat/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/DayOfDefeat/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Day of Defeat: Source" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/DayOfDefeatSource/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/DayOfDefeatSource/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Fistful of Frags" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/FistfulOfFrags/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/FistfulOfFrags/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Garrys's Mod" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/GarrysMod/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/GarrysMod/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Half Life 2: Deathmatch" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/HalfLife2Deathmatch/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/HalfLife2Deathmatch/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Half Life: Deathmatch Classic" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/HalfLifeDeathmatchClassic/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/HalfLifeDeathmatchClassic/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Insurgency" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Insurgency/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Insurgency/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Just Cause 2" ]; then - echo "lgsm-default.cfg not required." fn_jc2config elif [ "${gamename}" == "Killing Floor" ]; then - echo "lgsm-default.cfg not required." fn_unreal2config elif [ "${gamename}" == "Left 4 Dead" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Left4Dead/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Left4Dead/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Left 4 Dead 2" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Left4Dead2/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/Left4Dead2/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "No More Room in Hell" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/NoMoreRoomInHell/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/NoMoreRoomInHell/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Red Orchestra: Ostfront 41-45" ]; then - echo "lgsm-default.cfg not required." fn_unreal2config elif [ "${gamename}" == "Serious Sam 3: BFE" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/SeriousSam3BFE/cfg/lgsm-default.ini + echo -e "downloading lgsm-default.ini...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/SeriousSam3BFE/cfg/lgsm-default.ini 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_serious3config elif [ "${gamename}" == "Team Fortress 2" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/TeamFortress2/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/TeamFortress2/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_sourceconfig elif [ "${gamename}" == "Team Fortress Classic" ]; then - wget --no-check-certificate -nv -N https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/TeamFortressClassic/cfg/lgsm-default.cfg + echo -e "downloading lgsm-default.cfg...\c" + wget -N --no-check-certificate /dev/null https://raw.githubusercontent.com/dgibbs64/linuxgameservers/master/TeamFortressClassic/cfg/lgsm-default.cfg 2>&1 | grep -F HTTP | cut -c45- | uniq + sleep 1 fn_goldsourceconfig elif [ "${gamename}" == "Unreal Tournament 2004" ]; then - echo "lgsm-default.cfg not required." fn_unreal2config elif [ "${gamename}" == "Unreal Tournament 99" ]; then - echo "lgsm-default.cfg not required." fn_ut99config fi \ No newline at end of file diff --git a/functions/fn_serverdirectory b/functions/fn_serverdirectory index c015789d5..6a227fe12 100644 --- a/functions/fn_serverdirectory +++ b/functions/fn_serverdirectory @@ -2,8 +2,9 @@ # LGSM fn_serverdirectory function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 011214 +# Version: 241214 +echo "" echo "Server Directory" echo "=================================" echo "" diff --git a/functions/fn_steamdl b/functions/fn_steamdl index 7c3bea06b..7d52972da 100644 --- a/functions/fn_steamdl +++ b/functions/fn_steamdl @@ -2,7 +2,7 @@ # LGSM fn_steamdl function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 231214 +# Version: 241214 echo "" echo "Installing SteamCMD" @@ -13,7 +13,7 @@ sleep 1 cd "steamcmd" if [ ! -f steamcmd.sh ]; then echo -e "downloading steamcmd_linux.tar.gz...\c" - wget --no-check-certificate /dev/null http://media.steampowered.com/client/steamcmd_linux.tar.gz 2>&1 | grep -F HTTP | cut -c45- + wget -N --no-check-certificate /dev/null http://media.steampowered.com/client/steamcmd_linux.tar.gz 2>&1 | grep -F HTTP | cut -c45-| uniq tar --verbose -zxf steamcmd_linux.tar.gz rm -v steamcmd_linux.tar.gz chmod +x steamcmd.sh diff --git a/functions/fn_steamfix b/functions/fn_steamfix index 20ac92929..c034bfe5e 100644 --- a/functions/fn_steamfix +++ b/functions/fn_steamfix @@ -2,9 +2,10 @@ # LGSM fn_libsteamfix function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 151214 +# Version: 241214 fn_steamclientfix(){ +echo "" echo "Applying steamclient.so fix" echo "=================================" sleep 1 @@ -17,6 +18,7 @@ echo "" # Gary's Mod Specific fn_libsteamfix(){ +echo "" echo "Applying libsteam.so fix" echo "=================================" sleep 1 diff --git a/functions/fn_updateserver b/functions/fn_updateserver index 537f970ff..9028362b4 100644 --- a/functions/fn_updateserver +++ b/functions/fn_updateserver @@ -2,7 +2,7 @@ # LGSM fn_updateserver function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 011214 +# Version: 241214 fn_rootcheck fn_syscheck @@ -13,4 +13,4 @@ sleep 1 fn_scriptlog "Updating ${servername}" cd "${rootdir}" cd "steamcmd" -./steamcmd.sh +login ${steamuser} "${steampass}" +force_install_dir "${filesdir}" +app_update ${appid} +quit|tee -a "${scriptlog}" +./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit|tee -a "${scriptlog}" diff --git a/functions/fn_validateserver b/functions/fn_validateserver index aa3370a0a..f42f5af8a 100644 --- a/functions/fn_validateserver +++ b/functions/fn_validateserver @@ -2,7 +2,7 @@ # LGSM fn_validateserver function # Author: Daniel Gibbs # Website: http://danielgibbs.co.uk -# Version: 011214 +# Version: 241214 fn_rootcheck fn_syscheck @@ -19,4 +19,4 @@ sleep 1 fn_scriptlog "Validating ${servername}" cd "${rootdir}" cd "steamcmd" -./steamcmd.sh +login ${steamuser} "${steampass}" +force_install_dir "${filesdir}" +app_update ${appid} validate +quit|tee -a "${scriptlog}" +./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" validate +quit|tee -a "${scriptlog}"