fixed broken update.

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

Makefile

@@ -83,11 +83,11 @@ check-activate:
 clean-tmp:
 	rm -rf $(BUILDDIR)
 	rm -rf $(BUILDROOTDIR)
-	rm -rf $(SOURCETARBALL)
+	rm -f  $(SOURCETARBALL)
 	
 clean-pkg:
 	rm -rf $(RPMSDIR)
 	rm -rf $(SRPMSDIR)
 
 clean: clean-tmp clean-pkg
-
+	rm -f $(SOURCESDIR)/$(NAME)-*.tar.gz

README.md

@@ -1,2 +1,24 @@
 # kf2-srv
-Killing Floor 2 server tool for RHEL/CentOS 8
+*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)
+[![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)
+[![GitHub Release Date](https://img.shields.io/github/release-date/genzmey/kf2-srv)](https://github.com/genzmey/kf2-srv/releases/latest)
+
+# Features
+...
+
+# Build
+...
+
+# Install
+...
+
+# Usage
+...
+
+# License
+![GitHub](https://img.shields.io/github/license/genzmey/kf2-srv)
+...

SOURCES/Makefile

@@ -27,6 +27,7 @@ PREFIX          = /usr/local
 MAINLOGDIR      = $(DESTDIR)/var/log/$(NAME)
 BETALOGDIR      = $(DESTDIR)/var/log/$(NAME)-beta
 CONFDIR         = $(DESTDIR)/etc/$(NAME)
+BASHCOMPDIR     = $(DESTDIR)/etc/bash_completion.d
 INSTMAINDIR     = $(CONFDIR)/instances
 INSTBETADIR     = $(CONFDIR)/instances-beta
 MAPCYCLEDIR     = $(CONFDIR)/mapcycles
@@ -88,6 +89,7 @@ filesystem:
 	test -d '$(RSYSLOGDIR)'   || install -m 755 -d '$(RSYSLOGDIR)'
 	test -d '$(SCRIPTGRPDIR)' || install -m 755 -d '$(SCRIPTGRPDIR)'
 	test -d '$(SCRIPTLIBDIR)' || install -m 755 -d '$(SCRIPTLIBDIR)'
+	test -d '$(BASHCOMPDIR)'  || install -m 755 -d '$(BASHCOMPDIR)'
 
 install: filesystem build
 	install -m 755 $(RELEASEDIR)/main/$(NAME)                                  $(BINDIR)
@@ -128,6 +130,8 @@ install: filesystem build
 	install -m 644 $(RELEASEDIR)/config/$(NAME).conf                           $(CONFDIR)
 	
 	install -m 644 $(SOURCEDIR)/COPYING                                        $(LICENSEDIR)
+	
+	install -m 644 $(RELEASEDIR)/main/bash_completion/$(NAME)                  $(BASHCOMPDIR)
 
 uninstall:
 	rm -f  $(BINDIR)/$(NAME)
@@ -201,6 +205,8 @@ test: fake-systemd-build
 	$(BASHCHECK)      $(RELEASEDIR)/main/lib/playerids.lib
 	$(BASHCHECK)      $(RELEASEDIR)/main/lib/webadmin.lib
 	$(BASHCHECK)      $(RELEASEDIR)/main/lib/workshop.lib
+	
+	$(BASHCHECK)      $(RELEASEDIR)/main/bash_completion/$(NAME)
 
 clean:
 	rm -rf $(RELEASEDIR)

SOURCES/main/bash_completion/kf2-srv

@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# kf2-srv is a command line tool for managing a set of Killing Floor 2 servers.
+# Copyright (C) 2019, 2020 GenZmeY
+# mailto: genzmey@gmail.com
+# 
+# This file is part of kf2-srv.
+#
+# kf2-srv is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 ()
+{
+	function groups_list ()
+	{
+		find "$GrpDir"          \
+			-mindepth 1         \
+			-maxdepth 1         \
+			-type d             \
+			-printf "%f\n"
+	}
+
+	function commands_list () # $1: Command group
+	{
+		test -d "$GrpDir/$1" && \
+		find "$GrpDir/$1"       \
+			-mindepth 1         \
+			-maxdepth 1         \
+			-type f             \
+			-printf "%f\n"
+	}
+
+	function instances_list ()
+	{
+		find "$InsDir"          \
+			-mindepth 1         \
+			-maxdepth 1         \
+			-type d             \
+			-printf "%f\n"
+	}
+	
+	function command_usage_processing () # $1: Command group, $2: Command, $3: Current argument position
+	{
+		local CmdParams=$("$KF2Srv" "$1" "$2" "usage")
+		local LocalPosition; ((LocalPosition = $3 - 2))
+		
+		local ParamIndex=0
+		local LastParam
+		for Param in $CmdParams
+		do
+			((ParamIndex++))
+			if [[ "$ParamIndex" -eq "$LocalPosition" ]]; then
+				if echo "$Param" | grep -Fq '<instance>'; then
+					COMPREPLY=($(compgen -W "$(instances_list)" -- "${CURARG}"))
+				fi
+				return 0
+			fi
+			LastParam="$Param"
+		done
+		
+		if echo "$LastParam" | grep -Fq '<instance>...'; then
+			COMPREPLY=($(compgen -W "$(instances_list)" -- "${CURARG}"))
+		fi
+	}
+	
+	COMPREPLY=()
+	CURARG="${COMP_WORDS[COMP_CWORD]}"
+	
+	case "${COMP_CWORD}" in
+		1 ) COMPREPLY=($(compgen -W "$(groups_list)"                    -- "${CURARG}"))  ;;
+		2 ) COMPREPLY=($(compgen -W "$(commands_list ${COMP_WORDS[1]})" -- "${CURARG}"))  ;;
+		* ) command_usage_processing "${COMP_WORDS[1]}" "${COMP_WORDS[2]}" "${COMP_CWORD}";;
+	esac
+	
+	return 0
+}
+
+function _kf2_srv_main_completions ()
+{
+	local GrpDir=":DEFINE_PREFIX:/share/kf2-srv/cmdgrp"
+	local InsDir="/etc/kf2-srv/instances"
+	local KF2Srv=":DEFINE_PREFIX:/bin/kf2-srv"
+	
+	_kf2_srv_completions
+}
+
+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
@@ -90,6 +90,11 @@ function is_help () # $1: Arg
 	echo "$1" | grep -Piqo '^(-h|--help|help)$'
 }
 
+function is_usage () # $1: Arg
+{
+	echo "$1" | grep -Piqo '^usage$'
+}
+
 function is_version () # $1: Arg
 {
 	echo "$1" | grep -Piqo '^(-v|--version|version)$'
@@ -197,6 +202,12 @@ elif [[ -d "$GroupPathname" ]]; then
 			else
 				echo "No help page for this command."
 			fi
+		elif is_usage "$1"; then
+			if function_exists "cmd_usage"; then
+				cmd_usage
+			else
+				echo "No usage information for this command."
+			fi
 		else
 			if function_exists "cmd_main"; then
 				if function_exists "cmd_need_installed_server" && cmd_need_installed_server && ! server_exists; then

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,8 +1,8 @@
 %global steamuser steam
 
 Name:       kf2-srv
-Version:    0.14.1
+Version:    0.15.4
-Release:    2%{dist}
+Release:    1%{dist}
 Summary:    Killing Floor 2 server
 Group:      Amusements/Games
 License:    GNU GPLv3
@@ -31,6 +31,7 @@ Requires:   multini >= 0.2.3
 Requires:   rsyslog >= 8.25.0
 Requires:   logrotate
 Requires:   inotify-tools
+Requires:   bash-completion >= 2.7
 
 Provides:   %{name}
 
@@ -80,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root)                            %{_sysconfdir}/logrotate.d/%{name}
 %attr(0644,root,root)                            %{_datadir}/%{name}/cmdgrp/*/*
 %attr(0644,root,root)                            %{_datadir}/%{name}/lib/*
+%attr(0644,root,root)                            %{_sysconfdir}/bash_completion.d/%{name}
 
 %preun
 if [[ $1 -eq 0 ]] ; then # Uninstall
@@ -99,6 +101,23 @@ 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.
+
+* Thu Aug 13 2020 GenZmeY <genzmey@gmail.com> - 0.15.0-1
+- bash completion support.
+
 * Mon Aug 10 2020 GenZmeY <genzmey@gmail.com> - 0.14.1-2
 - github-actions build.
 

TODO

@@ -7,5 +7,4 @@
 - ban history
 - temporary ban
 - generate unique password for server bot on install
-- bash completion