elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-22 06:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues when running with relative path

Browse Source
This commit is contained in:
Ben Peddell 2021-03-14 06:27:14 +10:00
parent bfe8c15238
commit d6bbe867ea
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/arkmanager
View File

@ -43,6 +43,8 @@ arkstGithubRepo="${arkstGithubRepoOverride:-arkmanager/ark-server-tools}"
arkstGlobalCfgFile="${arkstGlobalCfgFileOverride:-/etc/arkmanager/arkmanager.cfg}" arkstGlobalCfgFile="${arkstGlobalCfgFileOverride:-/etc/arkmanager/arkmanager.cfg}"
arkstUserCfgFile="${arkstUserCfgFileOverride:-.arkmanager.cfg}" arkstUserCfgFile="${arkstUserCfgFileOverride:-.arkmanager.cfg}"
arkstScriptPath="$(realpath "$0")"
doUpgradeTools() { doUpgradeTools() {
if [ -n "$arkstUsePkgManager" ]; then if [ -n "$arkstUsePkgManager" ]; then
echo "arkmanager v${arkstVersion}: Please check for, and install, updates using your system's package manager" echo "arkmanager v${arkstVersion}: Please check for, and install, updates using your system's package manager"
@ -102,7 +104,7 @@ doUpgradeToolsFromCommit(){
if [ "$result" = 0 ] || [ "$result" = 2 ]; then if [ "$result" = 0 ] || [ "$result" = 2 ]; then
echo "ARK Server Tools successfully upgraded" echo "ARK Server Tools successfully upgraded"
"$0" --version "${arkstScriptPath}" --version
else else
echo "ARK Server Tools upgrade failed" echo "ARK Server Tools upgrade failed"
fi fi
@ -233,7 +235,7 @@ runAsRoot(){
exit 1 exit 1
else else
echo "Attempting to drop privileges; re-running as $steamcmd_user" >&2 echo "Attempting to drop privileges; re-running as $steamcmd_user" >&2
exec /sbin/runuser "$steamcmd_user" -s "$steamcmd_user_shellexec" -c "$(printf "%q" "$0") --runfromroot$(printf " %q" "$@")" exec /sbin/runuser "$steamcmd_user" -s "$steamcmd_user_shellexec" -c "$(printf "%q" "${arkstScriptPath}") --runfromroot$(printf " %q" "$@")"
exit 1 exit 1
fi fi
} }
@ -268,7 +270,7 @@ fi
if [[ -n "${steamcmd_user}" && "${steamcmd_user}" != "--me" && "$USERNAME" != "${steamcmd_user}" && -n "$usesudo" ]]; then if [[ -n "${steamcmd_user}" && "${steamcmd_user}" != "--me" && "$USERNAME" != "${steamcmd_user}" && -n "$usesudo" ]]; then
echo "Attempting to run as $steamcmd_user" >&2 echo "Attempting to run as $steamcmd_user" >&2
exec sudo --user="${steamcmd_user}" "$0" "$@" exec sudo --user="${steamcmd_user}" "${arkstScriptPath}" "$@"
fi fi
if [[ -n "${serverbasedir}" && -d "${serverbasedir}" ]]; then if [[ -n "${serverbasedir}" && -d "${serverbasedir}" ]]; then
@ -3906,8 +3908,8 @@ main(){
if [ -n "${arkstTag}" ]; then if [ -n "${arkstTag}" ]; then
echo "Release Tag: ${arkstTag}" echo "Release Tag: ${arkstTag}"
fi fi
blobsize="$(sed "s@^\\(arkst\\(Commit\\|Tag\\|RootUseEnv\\|UsePkgManager\\|GithubRepoOverride\\|GlobalCfgFileOverride\\|UserCfgFileOverride\\)\\)=.*@\\1=''@" "$0" | wc -c)" blobsize="$(sed "s@^\\(arkst\\(Commit\\|Tag\\|RootUseEnv\\|UsePkgManager\\|GithubRepoOverride\\|GlobalCfgFileOverride\\|UserCfgFileOverride\\)\\)=.*@\\1=''@" "${arkstScriptPath}" | wc -c)"
echo "Blob SHA: $( (echo -ne "blob ${blobsize}\0"; sed "s@^\\(arkst\\(Commit\\|Tag\\|RootUseEnv\\|UsePkgManager\\|GithubRepoOverride\\|GlobalCfgFileOverride\\|UserCfgFileOverride\\)\\)=.*@\\1=''@" "$0") | sha1sum | cut -d' ' -f1)" echo "Blob SHA: $( (echo -ne "blob ${blobsize}\0"; sed "s@^\\(arkst\\(Commit\\|Tag\\|RootUseEnv\\|UsePkgManager\\|GithubRepoOverride\\|GlobalCfgFileOverride\\|UserCfgFileOverride\\)\\)=.*@\\1=''@" "${arkstScriptPath}") | sha1sum | cut -d' ' -f1)"
exit 1 exit 1
;; ;;
-h|--help) -h|--help)