KillingFloor2/KF2-SRV
KillingFloor2/KF2-SRV
1
0
Fork 0
Code Releases 11 Activity

fix: run_as_root / run_as_steam arg count

Browse Source
This commit is contained in:
GenZmeY 2020-08-08 05:02:12 +03:00
parent 89e09826f7
commit 620f91e5e9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SOURCES/main/kf2-srv
View File

@ -64,7 +64,7 @@ function run_as_steamuser () # $@: command
include "/etc/steamcmd/steamcmd.conf" include "/etc/steamcmd/steamcmd.conf"
if [[ "$(whoami)" == "$SteamUser" ]]; then if [[ "$(whoami)" == "$SteamUser" ]]; then
shift 2; 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 -u "$SteamUser" "$@"
@ -76,7 +76,7 @@ function run_as_steamuser () # $@: command
function run_as_root () # $@: command function run_as_root () # $@: command
{ {
if [[ "$(whoami)" == "root" ]]; then if [[ "$(whoami)" == "root" ]]; then
shift 2; 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 "$@"

4
SOURCES/main/lib/instance.lib
View File

@ -67,7 +67,7 @@ function instance_add () # $*: InstanceName[s]
exit 1 exit 1
elif ! server_exists; then elif ! server_exists; then
echo "You must install server first" echo "You must install server first"
echo "Run \"$ScriptName --update\" to install it" echo "Run \"$ScriptName game update\" to install it"
exit 1 exit 1
fi fi
@ -132,7 +132,7 @@ function instance_add () # $*: InstanceName[s]
done done
} }
function instance_chat () function instance_chat () # $1: Message, $*: instance...
{ {
include "$LibDir/webadmin.lib" include "$LibDir/webadmin.lib"