From cbe5e2ea5034213efbbc91d9873e2cc8f3d915cf Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Mon, 30 May 2016 18:39:03 +1000 Subject: [PATCH] Fix Blob SHA breakage --- netinstall.sh | 2 -- tools/arkmanager | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/netinstall.sh b/netinstall.sh index e1e679a..564b3d9 100644 --- a/netinstall.sh +++ b/netinstall.sh @@ -43,8 +43,6 @@ curl -L -k -s https://github.com/FezVrasta/ark-server-tools/archive/${COMMIT}.ta # Install ARK Server Tools cd ark-server-tools-${COMMIT}/tools sed -i "s|^arkstCommit='.*'$|arkstCommit='${COMMIT}'|" arkmanager -version=`<../.version` -sed -i "s|^arkstVersion=\".*\"|arkstVersion='${version}'|" arkmanager chmod +x install.sh bash install.sh "$steamcmd_user" "$@" >"$output" 2>&1 diff --git a/tools/arkmanager b/tools/arkmanager index 27faac2..57d6ef3 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -7,7 +7,7 @@ # Contributors: Sispheor, Atriusftw, klightspeed, lexat, puseidr # Script version -arkstVersion="1.6" +arkstVersion='1.6' arkstCommit='' doUpgradeTools() { @@ -2191,7 +2191,8 @@ while true; do if [ -n "${arkstCommit}" ]; then echo "Commit: ${arkstCommit:0:7}" fi - echo "Blob SHA: $( (echo -ne "blob $(stat -c "%s" "$0")\0"; sed "s@^arkstCommit=.*@arkstCommit=''@" "$0") | sha1sum | cut -d' ' -f1)" + blobsize="$(sed "s@^arkstCommit=.*@arkstCommit=''@" "$0" | wc -c)" + echo "Blob SHA: $( (echo -ne "blob ${blobsize}\0"; sed "s@^arkstCommit=.*@arkstCommit=''@" "$0") | sha1sum | cut -d' ' -f1)" exit 1 ;; -h|--help)