From 6451e287581f5112f1ed932d6cf78b24a17dabc0 Mon Sep 17 00:00:00 2001 From: Marcus Date: Fri, 26 Aug 2022 01:14:27 +0200 Subject: [PATCH] added option to update or install --- LICENSE.md | 9 ---- install-xash3ds.sh | 130 ++++++++++++++++++++++++++++----------------- 2 files changed, 81 insertions(+), 58 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index c79ef6f..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -MIT License - -Copyright 2022 DeltaLima - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/install-xash3ds.sh b/install-xash3ds.sh index 7f1e876..f471299 100644 --- a/install-xash3ds.sh +++ b/install-xash3ds.sh @@ -9,23 +9,8 @@ metamod_url="https://github.com/mittorn/metamod-p/releases/download/1/metamod.so amxmod_url="http://www.amxmodx.org/release/amxmodx-$amxmod_version-base-linux.tar.gz" jk_botti_url="http://koti.kapsi.fi/jukivili/web/jk_botti/jk_botti-$jk_botti_version-release.tar.xz" - -case $1 in -"client") - CLIENT=true - PACKAGES="git curl build-essential gcc-multilib g++-multilib python python2 libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386" - WAF_OPTION="--enable-utils --enable-stb" - export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig -;; -"server") -CLIENT=false - XASHDS_PORT=27015 - CLIENT=false - PACKAGES="build-essential ca-certificates cmake curl git gnupg2 g++-multilib lib32gcc1-s1 libstdc++6:i386 python unzip xz-utils zip" - WAF_OPTION="-d" -;; -*) - echo "Usage: ./$0 [server|client]" +showhelp() { + echo "Usage: ./$0 [server|client] [install|update]" echo "" echo "Description: Script to install an Xash3D-FWGS client or Xash3D dedicated server with game data from steamcmd" echo "Server tested on Debian 11 ; Client tested on Ubuntu 20.04" @@ -36,40 +21,86 @@ CLIENT=false echo $hlds_url echo https://github.com/FWGS/xash3d-fwgs exit 1 -;; +} + +case $1 in + "client") + CLIENT=true + PACKAGES="git curl build-essential gcc-multilib g++-multilib python python2 libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386" + WAF_OPTION="--enable-utils --enable-stb" + export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig + ;; + "server") + CLIENT=false + XASHDS_PORT=27015 + CLIENT=false + PACKAGES="build-essential ca-certificates cmake curl git gnupg2 g++-multilib lib32gcc1-s1 libstdc++6:i386 python unzip xz-utils zip" + WAF_OPTION="-d" + ;; + *) + showhelp + ;; +esac + +case $2 in + "update") + ;; + + "install") + ;; + + *) + showhelp + ;; esac echo "= Creating directories =" XASH3D_BASEDIR=$(pwd)/build -mkdir -p $XASH3D_BASEDIR/result +XASH3D_RESULTDIR=$XASH3D_BASEDIR/result +test -d $XASH3D_RESULTDIR || mkdir -p $XASH3D_RESULTDIR - -echo "= Performing apt install =" -sudo dpkg --add-architecture i386 -sudo apt update -sudo apt-get install -y --no-install-recommends $PACKAGES +if [ "$2" == "install"] +then + echo "= Performing apt install =" + sudo dpkg --add-architecture i386 + sudo apt update + sudo apt-get install -y --no-install-recommends $PACKAGES +fi echo "= Compiling xash3d-fwgs =" ## compile xash3ds # go to build directory cd $XASH3D_BASEDIR -git clone --recursive https://github.com/FWGS/xash3d-fwgs -mkdir -p xash3d-fwgs/bin/ -cd xash3d-fwgs +case $2 in + "install") + git clone --recursive https://github.com/FWGS/xash3d-fwgs + mkdir -p xash3d-fwgs/bin/ + cd xash3d-fwgs + ;; + "update") + cd xash3d-fwgs + rm bin/* + git pull + ;; + *) + exit 1 + ;; +esac ## old if you use deprecated xash3d ## cmake -DXASH_DEDICATED=ON -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" ../ ## make - ./waf configure -T release $WAF_OPTION ./waf build ./waf install --destdir=bin/ ## here we fetch half-life from steam server -mkdir -p $XASH3D_BASEDIR/steam -cd $XASH3D_BASEDIR/steam -## an steamcmd automation -echo "login anonymous +if [ "$2" == "install" ] +then + mkdir -p $XASH3D_BASEDIR/steam + cd $XASH3D_BASEDIR/steam + ## an steamcmd automation + echo "login anonymous force_install_dir $XASH3D_BASEDIR/result app_set_config 90 mod valve app_update 90 @@ -78,31 +109,32 @@ app_update 90 validate app_update 90 validate quit" > $XASH3D_BASEDIR/steam/hlds.install -echo "= fetching hlds with steamcmd =" -## fetch steamcmd -curl -L "$steamcmd_url" | tar xzvf - -## run half-life download from steam server with steamcmd -## If grep find Error then fetch the hlds zip from github -echo "= This can take a while depending ony your connection =" -if ./steamcmd.sh +runscript hlds.install | grep Error -then - echo "= !! There was an error fetching hlds with steamcmd. Fetching it from github !! =" - echo $hlds_url - ## this is just another source you can use instead of steamcmd. - curl -LJO "$hlds_url" - unzip "hlds_build_$hlds_build.zip" -d "hlds_build_$hlds_build" - cp -R "hlds_build_$hlds_build/hlds_build_$hlds_build"/* $XASH3D_BASEDIR/result/ + echo "= fetching hlds with steamcmd =" + ## fetch steamcmd + curl -L "$steamcmd_url" | tar xzvf - + ## run half-life download from steam server with steamcmd + ## If grep find Error then fetch the hlds zip from github + echo "= This can take a while depending ony your connection =" + if ./steamcmd.sh +runscript hlds.install | grep Error + then + echo "= !! There was an error fetching hlds with steamcmd. Fetching it from github !! =" + echo $hlds_url + ## this is just another source you can use instead of steamcmd. + curl -LJO "$hlds_url" + unzip "hlds_build_$hlds_build.zip" -d "hlds_build_$hlds_build" + cp -R "hlds_build_$hlds_build/hlds_build_$hlds_build"/* $XASH3D_RESULTDIR + fi fi ## copy xash3d binaries to result ## place Xash3D binaries in result and overwrite all echo "= copy xash3d binaries to build/result" -cp -R $XASH3D_BASEDIR/xash3d-fwgs/bin/* $XASH3D_BASEDIR/result/ +cp -R $XASH3D_BASEDIR/xash3d-fwgs/bin/* $XASH3D_RESULTDIR touch $XASH3D_BASEDIR/result/valve/listip.cfg touch $XASH3D_BASEDIR/result/valve/banned.cfg # it seems that the build actually (21.08.2022) is buggy and does not exec server.cfg by its own -if [ "$1" == "server" ] +if [ "$1" == "server" ] && [ "$2" == "install" ] then echo "= Creating start.sh script for dedicated server in build/result =" echo "./xash +ip 0.0.0.0 -port $XASHDS_PORT -pingboost 1 -timeout 3 +map boot_camp +exec server.cfg" > $XASH3D_BASEDIR/result/start.sh @@ -111,4 +143,4 @@ then fi echo "= DONE! If everything went well an no errors occured you can just run your game/server from $XASH3D_BASEDIR/result/ =" -echo "= starting server: ./start.sh ; starting game client ./xash3d =" \ No newline at end of file +echo "= starting server: ./start.sh ; starting game client ./xash3d ="