From a307643e9029d9f8aed567691860c15245b861bf Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Thu, 24 Sep 2015 09:18:36 +1000 Subject: [PATCH 1/2] Fix config variable fetching --- tools/arkmanager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index b6e47ce..9fdf5c0 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -70,7 +70,7 @@ doUninstallTools() { runAsRoot(){ getConfigVar(){ - val="$(echo -ne "$(sed -n "/^$1=/{s|^[^=]*||;s|^\"\\(.*\\)\"\$|\\1|;s|^'\\(.*\\)\$|\\1|;p}" <"/etc/arkmanager/arkmanager.cfg" | tail -n1)")" + val="$(echo -ne "$(sed -n "/^$1=/{s|^[^=]*=||;s|[[:space:]]*\(#.*\)*\$||;s|^\"\\(.*\\)\"\$|\\1|;s|^'\\(.*\\)'\$|\\1|;p}" <"/etc/arkmanager/arkmanager.cfg" | tail -n1)")" if [ -n "$val" ]; then echo "$val" else From 1505aa85ab64f51322b6b84ec41a675e32faf652 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Thu, 24 Sep 2015 09:22:33 +1000 Subject: [PATCH 2/2] Automatically su to steamcmd_user if run as root --- tools/arkmanager | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/tools/arkmanager b/tools/arkmanager index 9fdf5c0..800b991 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -94,16 +94,7 @@ runAsRoot(){ elif [ "$1" == "uninstall-tools" ]; then doUninstallTools else - echo -n "arkmanager v${arkstVersion}: " - if [ $# -eq 0 ]; then - echo "no command specified" - else - echo "unknown command '$1' specified" - fi - echo -e "Usage: arkmanager [OPTION]\n" - echo "Option Description" - echo "upgrade-tools Check for a new ARK Server Tools version and upgrades it if needed" - echo "uninstall-tools Uninstall the ARK Server Tools" + su "$steamcmd_user" -c "$(printf "%q" "$0")$(printf " %q" "$@")" exit 1 fi }