Compare commits

...

5 Commits

Author SHA1 Message Date
57006c867e fix 'find: Failed to restore initial working directory' 2020-08-15 15:32:10 +03:00
0f935c2faa fix: bashcomp
- fix bash completion for commands without parameters;
- fix bash completion for use not existing command group.
2020-08-15 15:05:37 +03:00
07043dd2b2 Merge branch 'master' of https://github.com/GenZmeY/kf2-srv 2020-08-14 15:04:08 +03:00
1e610e9b9f Update README.md 2020-08-13 06:01:21 +03:00
bc2551bfa0 Update README.md 2020-08-13 05:59:24 +03:00
4 changed files with 44 additions and 36 deletions

View File

@ -1,18 +1,11 @@
# kf2-srv # 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) [![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)
[![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) [![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 # Features
... ...
@ -26,8 +19,6 @@ Killing Floor 2 server tool for RHEL/CentOS 8
# Usage # Usage
... ...
# Contribution
...
# License # License
![GitHub](https://img.shields.io/github/license/genzmey/kf2-srv)
... ...

View File

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

View File

@ -67,7 +67,7 @@ function run_as_steamuser () # $@: command
shift 3; cmd_main "$@" shift 3; cmd_main "$@"
elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]] || [[ "$(whoami)" == "root" ]]; then elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]] || [[ "$(whoami)" == "root" ]]; then
export INC_LIBS="" export INC_LIBS=""
sudo -u "$SteamUser" "$@" sudo -iu "$SteamUser" "$@"
else else
echo "You must be a $SteamUser, root or sudo-user to run this command." echo "You must be a $SteamUser, root or sudo-user to run this command."
fi fi
@ -79,7 +79,7 @@ function run_as_root () # $@: command
shift 3; cmd_main "$@" shift 3; cmd_main "$@"
elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]]; then elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]]; then
export INC_LIBS="" export INC_LIBS=""
sudo "$@" sudo -i "$@"
else else
echo "You must be root or sudo-user to run this command." echo "You must be root or sudo-user to run this command."
fi fi

View File

@ -1,7 +1,7 @@
%global steamuser steam %global steamuser steam
Name: kf2-srv Name: kf2-srv
Version: 0.15.1 Version: 0.15.3
Release: 1%{dist} Release: 1%{dist}
Summary: Killing Floor 2 server Summary: Killing Floor 2 server
Group: Amusements/Games Group: Amusements/Games
@ -101,6 +101,13 @@ if [[ $1 == 1 ]]; then # Install
fi fi
%changelog %changelog
* 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 * Fri Aug 14 2020 GenZmeY <genzmey@gmail.com> - 0.15.1-1
- fix bash completion for kf2-srv-beta. - fix bash completion for kf2-srv-beta.