README.md

@@ -1,33 +1,24 @@
-# KF2-SRV
+# kf2-srv
 *Killing Floor 2 server tool for RHEL8/CentOS8*
 
-[![build release](https://github.com/GenZmeY/KF2-SRV/workflows/build%20release/badge.svg)](https://github.com/GenZmeY/KF2-SRV/actions?query=workflow%3A%22build+release%22)
+[![build release](https://github.com/GenZmeY/kf2-srv/workflows/build%20release/badge.svg)](https://github.com/GenZmeY/kf2-srv/actions?query=workflow%3A%22build+release%22)
-[![tests (master)](https://github.com/GenZmeY/KF2-SRV/workflows/tests%20(master)/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-SRV/actions?query=workflow%3A%22tests+%28master%29%22)
+[![tests (master)](https://github.com/GenZmeY/kf2-srv/workflows/tests%20(master)/badge.svg?branch=master)](https://github.com/GenZmeY/kf2-srv/actions?query=workflow%3A%22tests+%28master%29%22)
-[![GitHub release](https://img.shields.io/github/v/release/genzmey/KF2-SRV)](https://github.com/genzmey/KF2-SRV/releases/latest)
+[![tests (dev)](https://github.com/GenZmeY/kf2-srv/workflows/tests%20(dev)/badge.svg?branch=dev)](https://github.com/GenZmeY/kf2-srv/actions?query=workflow%3A%22tests+%28dev%29%22)
-[![GitHub Release Date](https://img.shields.io/github/release-date/genzmey/KF2-SRV)](https://github.com/genzmey/KF2-SRV/releases/latest)
+[![GitHub release](https://img.shields.io/github/v/release/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
-![GitHub](https://img.shields.io/github/license/genzmey/KF2-SRV)
+[![GitHub Release Date](https://img.shields.io/github/release-date/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
 
-# Warning
+# Features
-There is not and most likely never will be a detailed manual. If you don't have sufficient knowledge of Linux in general and CentOS in particular, as well as the ability to learn unknown tools, you probably shouldn't use this.
+...
+
+# Build
+...
+
+# Install
+...
 
 # Usage
-You can find actual rpm packages here(\*): https://github.com/GenZmeY/KF2-SRV/releases  
+...
-And dependencies here: https://cloud.genzmey.su/index.php/s/3GiwtDpkNyCarXc  
-Basic usage information: https://github.com/GenZmeY/KF2-SRV/blob/master/SOURCES/README  
-
-\* inotify-tools requirement can be ignored  
-
-- Install packages `steamcmd-2018.01.05-5.el8.x86_64.rpm`, `multini-0.4.3-1.el8.x86_64.rpm`, `kf2-srv-0.18.1-1.el8.noarch.rpm`  
-- `kf2-srv game update` or `kf2-srv-beta game update`  
-- use `kf2-srv --help` or `kf2-srv <COMMAND> --help` to see the actions available to you and decide what to do next  
-
-**Filesystem:**  
-configs: `/etc/kf2-srv/`  
-game server: `/usr/games/kf2-srv`  
-game server (beta): `/usr/games/kf2-srv-beta`  
-cache: `/var/cache/kf2-srv`  
-logs: `/var/log/kf2-srv`  
-logs (beta): `/var/logs/kf2-srv`  
 
 # License
-[GNU GPLv3](LICENSE)
+![GitHub](https://img.shields.io/github/license/genzmey/kf2-srv)
+...

SOURCES/main/lib/game.lib

@@ -96,10 +96,9 @@ 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
-	create_symlink_steamclient_so
+	fix_steamclient_so
 	instance_start
 }
 
@@ -108,8 +107,6 @@ 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
@@ -202,7 +199,7 @@ function first_install ()
 	
 	killall -KILL KFGameSteamServer.bin.x86_64; sleep 1
 	create_cache
-	create_symlink_steamclient_so
+	fix_steamclient_so
 	ln -s "$InstanceConfigDir" "$DefaultConfigDir/instances"
 	make_default_instance
 	apply_patch
@@ -244,7 +241,7 @@ function create_cache ()
 	fi
 }
 
-function remove_symlink_steamclient_so ()
+function fix_steamclient_so ()
 {
 	include /etc/kf2-srv/kf2-srv.conf
 	
@@ -252,18 +249,6 @@ function remove_symlink_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"

SPECS/kf2-srv.spec

@@ -1,7 +1,7 @@
 %global steamuser steam
 
 Name:       kf2-srv
-Version:    0.18.1
+Version:    0.18.0
 Release:    1%{dist}
 Summary:    Killing Floor 2 server
 Group:      Amusements/Games
@@ -101,9 +101,6 @@ if [[ $1 == 1 ]]; then # Install
 fi
 
 %changelog
-* Tue Jun 22 2021 GenZmeY <genzmey@gmail.com> - 0.18.1-1
-- fix "FixSteamclientLib" setting.
-
 * Tue Jun 22 2021 GenZmeY <genzmey@gmail.com> - 0.18.0-1
 - add FixSteamclientLib setting to config.
 

TODO

@@ -0,0 +1,8 @@
+- selinux
+- kick by level
+- man pages
+- ban EGS players
+- ban history
+- temporary ban
+- generate unique password for server bot on install
+

TODO.md

@@ -1,4 +0,0 @@
-# TODO:
-- [ ] split source and rpmbuild
-- [ ] add shellcheck
-- [ ] webadmin patch