fixed broken update.

- fix bash completion for commands without parameters;
- fix bash completion for use not existing command group.

README.md

@@ -1,18 +1,11 @@
 # kf2-srv
-Killing Floor 2 server tool for RHEL/CentOS 8
+*Killing Floor 2 server tool for RHEL8/CentOS8*
-
-![GitHub](https://img.shields.io/github/license/genzmey/kf2-srv)
-[![made-with-bash](https://img.shields.io/badge/Made%20with-Bash-1f425f.svg)](https://www.gnu.org/software/bash/)
-
-[![GitHub release](https://img.shields.io/github/v/release/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
-[![GitHub Release Date](https://img.shields.io/github/release-date/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
 
 [![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 (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](https://img.shields.io/github/v/release/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
-# Description
+[![GitHub Release Date](https://img.shields.io/github/release-date/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
-...
 
 # Features
 ...
@@ -26,8 +19,6 @@ Killing Floor 2 server tool for RHEL/CentOS 8
 # Usage
 ...
 
-# Contribution
-...
-
 # License
+![GitHub](https://img.shields.io/github/license/genzmey/kf2-srv)
 ...

SOURCES/main/bash_completion/kf2-srv

@@ -19,36 +19,33 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-function _kf2_srv_completions () # $1: BetaPostfix
+function _kf2_srv_completions ()
 {
-	local GrpDir=":DEFINE_PREFIX:/share/kf2-srv/cmdgrp"
-	local InsDir="/etc/kf2-srv/instances${1}"
-	local KF2Srv=":DEFINE_PREFIX:/bin/kf2-srv${1}"
-	
 	function groups_list ()
 	{
-		find "$GrpDir"       \
+		find "$GrpDir"          \
-			-mindepth 1      \
+			-mindepth 1         \
-			-maxdepth 1      \
+			-maxdepth 1         \
-			-type d          \
+			-type d             \
 			-printf "%f\n"
 	}
 
 	function commands_list () # $1: Command group
 	{
-		find "$GrpDir/$1"    \
+		test -d "$GrpDir/$1" && \
-			-mindepth 1      \
+		find "$GrpDir/$1"       \
-			-maxdepth 1      \
+			-mindepth 1         \
-			-type f          \
+			-maxdepth 1         \
+			-type f             \
 			-printf "%f\n"
 	}
 
 	function instances_list ()
 	{
-		find "$InsDir"       \
+		find "$InsDir"          \
-			-mindepth 1      \
+			-mindepth 1         \
-			-maxdepth 1      \
+			-maxdepth 1         \
-			-type d          \
+			-type d             \
 			-printf "%f\n"
 	}
 	
@@ -88,11 +85,24 @@ function _kf2_srv_completions () # $1: BetaPostfix
 	return 0
 }
 
-function _kf2_srv_beta_completions ()
+function _kf2_srv_main_completions ()
 {
-	_kf2_srv_completions "-beta"
+	local GrpDir=":DEFINE_PREFIX:/share/kf2-srv/cmdgrp"
+	local InsDir="/etc/kf2-srv/instances"
+	local KF2Srv=":DEFINE_PREFIX:/bin/kf2-srv"
+	
+	_kf2_srv_completions
 }
 
-complete -F _kf2_srv_completions kf2-srv
+function _kf2_srv_beta_completions ()
+{
+	local GrpDir=":DEFINE_PREFIX:/share/kf2-srv/cmdgrp"
+	local InsDir="/etc/kf2-srv/instances-beta"
+	local KF2Srv=":DEFINE_PREFIX:/bin/kf2-srv-beta"
+	
+	_kf2_srv_completions
+}
+
+complete -F _kf2_srv_main_completions kf2-srv
 complete -F _kf2_srv_beta_completions kf2-srv-beta
 

SOURCES/main/cmdgrp/instance/delete

@@ -19,8 +19,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-cmd_need_superuser        () { false ;}
+cmd_need_superuser        () { true  ;}
-cmd_need_steamuser        () { true  ;}
+cmd_need_steamuser        () { false ;}
 cmd_need_installed_server () { false ;}
 
 function cmd_usage ()

SOURCES/main/kf2-srv

@@ -43,7 +43,7 @@ readonly InstanceConfigTemplate="/etc/kf2-srv/instance.conf.template"
 
 readonly AppServerNum="232130"
 readonly AppClientNum="232090"
-readonly StrangeConstUID="17825793"
+readonly SteamConstB='17825793'
 readonly ServerBotLogin="srvbot"
 
 declare -a DiffNames
@@ -67,7 +67,7 @@ function run_as_steamuser () # $@: command
 		shift 3; cmd_main "$@"
 	elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]] || [[ "$(whoami)" == "root" ]]; then
 		export INC_LIBS=""
-		sudo -u "$SteamUser" "$@"
+		sudo -iu "$SteamUser" "$@"
 	else
 		echo "You must be a $SteamUser, root or sudo-user to run this command."
 	fi
@@ -79,7 +79,7 @@ function run_as_root () # $@: command
 		shift 3; cmd_main "$@"
 	elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]]; then
 		export INC_LIBS=""
-		sudo "$@"
+		sudo -i "$@"
 	else
 		echo "You must be root or sudo-user to run this command."
 	fi

SOURCES/main/lib/ban.lib

@@ -108,7 +108,7 @@ function ban_ID3 () # $1: ID3
 	do
 	(
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
-		local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
+		local BanStr="(Uid=(A=$ID3,B=$SteamConstB))"
 		local Service=$(service_name "$Instance")
 		if ! multini -gq "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"; then
 			echo "Add ban $ID3 to $Instance"
@@ -137,7 +137,7 @@ function unban_ID3 () # $1: ID3
 	do
 	(
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
-		local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
+		local BanStr="(Uid=(A=$ID3,B=$SteamConstB))"
 		local Service=$(service_name "$Instance")
 		if systemctl -q is-active $Service ; then
 			local PlainID=0

SOURCES/main/lib/playerids.lib

@@ -19,35 +19,42 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# conversion algorithm taken from here:
+# WARNING:
-# https://github.com/noobient/killinuxfloor/blob/master/share/killinuxfloor
+# Conversion works correctly for positive A/B for EGS, 
-# thank bviktor for that :)
+# but still gives incorrect results if there are negative ones
-function steamID3_to_steamID64 () # $1: ID3
+
+function steamID3_to_steamID64 () # $1: ID3 (A), $2: B
 {
-    # steamID64 = "7656" + (steamID3 + 1197960265728)
+	local ID3="$1"
-    ID64=$1
+	if [[ -z $2 ]]; then
-    ((ID64+=1197960265728))
+		local B="$SteamConstB"
-    ID64="7656${ID64}"
+	else
-    echo "$ID64"
+		local B="$2"
+	fi
+	
+	# SteamID64=B*2^32+SteamID3
+    echo $(($B*(2**32)+$ID3))
 }
 
-function steamID64_to_steamID3 () # $1: ID4
+function steamID64_to_steamID3 () # $1: ID64, $2: B
 {
-    # steamID3 = substr(steamID64, 4) - 1197960265728
+	local ID64="$1"
-    ID3=${1:4}
+	if [[ -z $2 ]]; then
-    ((ID3-=1197960265728))
+		local B="$SteamConstB"
-    echo "$ID3"
+	else
+		local B="$2"
+	fi
+	
+	# SteamID3=SteamID64-B*2^32
+    echo $(($ID64-$B*(2**32)))
 }
 
 function any_to_ID3 () # $1: ID3/ID64/Url
 {
 	if echo "$1" | grep -qP '^http.+'; then
-		local Xml=$(mktemp)
+		local ID64=$(curl -ss "$1/?xml=1" | xmllint --xpath 'string(//steamID64/text())' -)
-		curl -ss "$1/?xml=1" > "$Xml"
-		local ID64=$(xmllint --xpath 'string(//steamID64/text())' "$Xml")
 		local ID3=$(steamID64_to_steamID3 "$ID64") 
-		rm -f "$Xml"
+	elif [[ $(echo "$1" | wc -m) -eq 18 ]] && echo "$1" | grep -qP '^7656[0-9]+' ; then
-	elif [[ $(echo "$1" | wc -m) -eq 18 ]] && echo "$1" | grep -qP '^76561[0-9]+' ; then
 		local ID3=$(steamID64_to_steamID3 "$1")
 	else
 		local ID3="$1"

SOURCES/main/systemd/kf2-srv-update.service

@@ -19,7 +19,7 @@ ExecStart=/bin/sleep 5m
 ExecStart=:DEFINE_PREFIX:/bin/kf2-srv instance chat 'Server shutting down...'
 ExecStart=/bin/sleep 5s
 
-ExecStart=:DEFINE_PREFIX:/bin/kf2-srv instance update
+ExecStart=:DEFINE_PREFIX:/bin/kf2-srv game update
 
 PrivateTmp=true
 PrivateDevices=true

SPECS/kf2-srv.spec

@@ -1,7 +1,7 @@
 %global steamuser steam
 
 Name:       kf2-srv
-Version:    0.15.1
+Version:    0.15.4
 Release:    1%{dist}
 Summary:    Killing Floor 2 server
 Group:      Amusements/Games
@@ -101,6 +101,17 @@ if [[ $1 == 1 ]]; then # Install
 fi
 
 %changelog
+* Sat Aug 15 2020 GenZmeY <genzmey@gmail.com> - 0.15.4-1
+- fixed broken update;
+- replaced steamID3/steamID64 conversation algorithm.
+
+* Sat Aug 15 2020 GenZmeY <genzmey@gmail.com> - 0.15.3-1
+- fix 'find: Failed to restore initial working directory'.
+
+* Sat Aug 15 2020 GenZmeY <genzmey@gmail.com> - 0.15.2-1
+- fix bash completion for commands without parameters;
+- fix bash completion for use not existing command group.
+
 * Fri Aug 14 2020 GenZmeY <genzmey@gmail.com> - 0.15.1-1
 - fix bash completion for kf2-srv-beta.