diff --git a/SOURCES/main/lib/game.lib b/SOURCES/main/lib/game.lib index 6f9d82f..3d8affa 100644 --- a/SOURCES/main/lib/game.lib +++ b/SOURCES/main/lib/game.lib @@ -96,9 +96,10 @@ function game_validate () local BetaArg="-beta preview" fi instance_stop + remove_symlink_steamclient_so steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg validate +exit apply_patch - fix_steamclient_so + create_symlink_steamclient_so instance_start } @@ -107,6 +108,8 @@ function first_install () include /etc/steamcmd/steamcmd.conf include /etc/kf2-srv/bot.conf + remove_symlink_steamclient_so + if ! steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg validate +exit; then echo "Errors during installation - exit" exit 1 @@ -199,7 +202,7 @@ function first_install () killall -KILL KFGameSteamServer.bin.x86_64; sleep 1 create_cache - fix_steamclient_so + create_symlink_steamclient_so ln -s "$InstanceConfigDir" "$DefaultConfigDir/instances" make_default_instance apply_patch @@ -241,7 +244,7 @@ function create_cache () fi } -function fix_steamclient_so () +function remove_symlink_steamclient_so () { include /etc/kf2-srv/kf2-srv.conf @@ -249,6 +252,18 @@ function fix_steamclient_so () rm -f "$InstallDir/linux64/steamclient.so" rm -f "$InstallDir/steamclient.so" rm -f "$InstallDir/Binaries/Win64/lib64/steamclient.so" + else + test -L "$InstallDir/linux64/steamclient.so" && rm -f "$InstallDir/linux64/steamclient.so" + test -L "$InstallDir/steamclient.so" && rm -f "$InstallDir/steamclient.so" + test -L "$InstallDir/Binaries/Win64/lib64/steamclient.so" && rm -f "$InstallDir/Binaries/Win64/lib64/steamclient.so" + fi +} + +function create_symlink_steamclient_so () +{ + include /etc/kf2-srv/kf2-srv.conf + + if echo "$FixSteamclientLib" | grep -qiF 'true'; then ln -s "/usr/games/steamcmd/linux64/steamclient.so" "$InstallDir/linux64/steamclient.so" ln -s "/usr/games/steamcmd/linux64/steamclient.so" "$InstallDir/steamclient.so" ln -s "/usr/games/steamcmd/linux64/steamclient.so" "$InstallDir/Binaries/Win64/lib64/steamclient.so" diff --git a/SPECS/kf2-srv.spec b/SPECS/kf2-srv.spec index 28f4336..e2c858b 100644 --- a/SPECS/kf2-srv.spec +++ b/SPECS/kf2-srv.spec @@ -1,7 +1,7 @@ %global steamuser steam Name: kf2-srv -Version: 0.18.0 +Version: 0.18.1 Release: 1%{dist} Summary: Killing Floor 2 server Group: Amusements/Games @@ -101,6 +101,9 @@ if [[ $1 == 1 ]]; then # Install fi %changelog +* Tue Jun 22 2021 GenZmeY - 0.18.1-1 +- fix "FixSteamclientLib" setting. + * Tue Jun 22 2021 GenZmeY - 0.18.0-1 - add FixSteamclientLib setting to config.