tweak version check [skip ci]

hotio · Feb 12, 2024 · a07e501 · a07e501
1 parent 8cca2a4
commit a07e501
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -10,10 +10,10 @@ RUN apk add --no-cache ffmpeg python3 py3-requests sqlite-libs
 
 ARG VERSION
 RUN curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/CHECKSUMS_SHA1" > "${APP_DIR}/CHECKSUMS_SHA1" && \
-    cat "${APP_DIR}/CHECKSUMS_SHA1" | grep "${VERSION:0:7}" && \
+    grep "${VERSION:0:7}" < "${APP_DIR}/CHECKSUMS_SHA1" && \
     curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux" > "${APP_DIR}/stash" && \
     CHECKSUM=$(sha1sum "${APP_DIR}/stash" | awk '{print $1}') && \
-    cat "${APP_DIR}/CHECKSUMS_SHA1" | grep "${CHECKSUM}" && \
+    grep "${CHECKSUM}" < "${APP_DIR}/CHECKSUMS_SHA1" && \
     chmod 755 "${APP_DIR}/stash"
 
 COPY root/ /
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -10,10 +10,10 @@ RUN apk add --no-cache ffmpeg python3 py3-requests sqlite-libs
 
 ARG VERSION
 RUN curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/CHECKSUMS_SHA1" > "${APP_DIR}/CHECKSUMS_SHA1" && \
-    cat "${APP_DIR}/CHECKSUMS_SHA1" | grep "${VERSION:0:7}" && \
+    grep "${VERSION:0:7}" < "${APP_DIR}/CHECKSUMS_SHA1" && \
     curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux-arm64v8" > "${APP_DIR}/stash" && \
     CHECKSUM=$(sha1sum "${APP_DIR}/stash" | awk '{print $1}') && \
-    cat "${APP_DIR}/CHECKSUMS_SHA1" | grep "${CHECKSUM}" && \
+    grep "${CHECKSUM}" < "${APP_DIR}/CHECKSUMS_SHA1" && \
     chmod 755 "${APP_DIR}/stash"
 
 COPY root/ /
diff --git a/update-versions.sh b/update-versions.sh
@@ -2,10 +2,10 @@
 version=$(curl -u "${GITHUB_ACTOR}:${GITHUB_TOKEN}" -fsSL "https://api.github.com/repos/stashapp/stash/releases/tags/latest_develop" | jq -re .target_commitish) || exit 1
 [[ ${version} == "develop" ]] && version=$(curl -u "${GITHUB_ACTOR}:${GITHUB_TOKEN}" -fsSL "https://api.github.com/repos/stashapp/stash/commits/develop" | jq -re .sha) || exit 1
 curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/CHECKSUMS_SHA1" -o CHECKSUMS_SHA1 || exit 1
-grep -q "${version:0:7}" < CHECKSUMS_SHA1
+grep -q "${version:0:7}" < CHECKSUMS_SHA1 || exit 1
 curl -fsSL "https://github.com/stashapp/stash/releases/download/latest_develop/stash-linux" -o stash || exit 1
 checksum="$(sha1sum stash | awk '{print $1}')"
-grep -q "${checksum}" < CHECKSUMS_SHA1
+grep -q "${checksum}" < CHECKSUMS_SHA1 || exit 1
 rm -rf CHECKSUMS_SHA1 stash
 json=$(cat VERSION.json)
 jq --sort-keys \