From 620f91e5e9549a03853c1300cc1c9562d601ffc5 Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Sat, 8 Aug 2020 05:02:12 +0300 Subject: [PATCH] fix: run_as_root / run_as_steam arg count --- SOURCES/main/kf2-srv | 4 ++-- SOURCES/main/lib/instance.lib | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SOURCES/main/kf2-srv b/SOURCES/main/kf2-srv index 6e31de5..bfee58d 100755 --- a/SOURCES/main/kf2-srv +++ b/SOURCES/main/kf2-srv @@ -64,7 +64,7 @@ function run_as_steamuser () # $@: command include "/etc/steamcmd/steamcmd.conf" if [[ "$(whoami)" == "$SteamUser" ]]; then - shift 2; cmd_main "$@" + shift 3; cmd_main "$@" elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]] || [[ "$(whoami)" == "root" ]]; then export INC_LIBS="" sudo -u "$SteamUser" "$@" @@ -76,7 +76,7 @@ function run_as_steamuser () # $@: command function run_as_root () # $@: command { if [[ "$(whoami)" == "root" ]]; then - shift 2; cmd_main "$@" + shift 3; cmd_main "$@" elif [[ -n $(groups "$(whoami)" | grep -Fo 'wheel') ]]; then export INC_LIBS="" sudo "$@" diff --git a/SOURCES/main/lib/instance.lib b/SOURCES/main/lib/instance.lib index 71d8bf2..dd218cb 100644 --- a/SOURCES/main/lib/instance.lib +++ b/SOURCES/main/lib/instance.lib @@ -67,7 +67,7 @@ function instance_add () # $*: InstanceName[s] exit 1 elif ! server_exists; then echo "You must install server first" - echo "Run \"$ScriptName --update\" to install it" + echo "Run \"$ScriptName game update\" to install it" exit 1 fi @@ -132,7 +132,7 @@ function instance_add () # $*: InstanceName[s] done } -function instance_chat () +function instance_chat () # $1: Message, $*: instance... { include "$LibDir/webadmin.lib"