diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page index f05e30baa..4e1b4a6bb 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -33,7 +33,7 @@ rm -rf .git cd "$HOME" wget "https://ziglang.org/builds/$NATIVE_TARBALL" tar xf "$NATIVE_TARBALL" -ZIGDIR=$(basename -s .tar.xz $NATIVE_TARBALL) +ZIGDIR=$(basename $NATIVE_TARBALL .tar.xz) ZIG="$ZIGDIR/zig" LANGREF="$ZIGDIR/langref.html" SRCTARBALLDIR="zig-$VERSION" @@ -43,27 +43,27 @@ tar cfJ "$SRC_TARBALL" "$SRCTARBALLDIR" export SRC_SHASUM=$(sha256sum $SRC_TARBALL | cut '-d ' -f1) export SRC_BYTESIZE=$(wc -c < $SRC_TARBALL) -X86_64_WINDOWS_JSON=$(curl --fail "X86_64_WINDOWS_JSON_URL" || exit 1) +X86_64_WINDOWS_JSON=$(curl --fail "$X86_64_WINDOWS_JSON_URL" || exit 1) export X86_64_WINDOWS_TARBALL="$(echo "$X86_64_WINDOWS_JSON" | jq .tarball -r)" export X86_64_WINDOWS_BYTESIZE="$(echo "$X86_64_WINDOWS_JSON" | jq .size -r)" export X86_64_WINDOWS_SHASUM="$(echo "$X86_64_WINDOWS_JSON" | jq .shasum -r)" -X86_64_MACOS_JSON=$(curl --fail "X86_64_MACOS_JSON_URL" || exit 1) +X86_64_MACOS_JSON=$(curl --fail "$X86_64_MACOS_JSON_URL" || exit 1) export X86_64_MACOS_TARBALL="$(echo "$X86_64_MACOS_JSON" | jq .tarball -r)" export X86_64_MACOS_BYTESIZE="$(echo "$X86_64_MACOS_JSON" | jq .size -r)" export X86_64_MACOS_SHASUM="$(echo "$X86_64_MACOS_JSON" | jq .shasum -r)" -X86_64_LINUX_JSON=$(curl --fail "X86_64_LINUX_JSON_URL" || exit 1) +X86_64_LINUX_JSON=$(curl --fail "$X86_64_LINUX_JSON_URL" || exit 1) export X86_64_LINUX_TARBALL="$(echo "$X86_64_LINUX_JSON" | jq .tarball -r)" export X86_64_LINUX_BYTESIZE="$(echo "$X86_64_LINUX_JSON" | jq .size -r)" export X86_64_LINUX_SHASUM="$(echo "$X86_64_LINUX_JSON" | jq .shasum -r)" -AARCH64_LINUX_JSON=$(curl --fail "AARCH64_LINUX_JSON_URL" || exit 1) +AARCH64_LINUX_JSON=$(curl --fail "$AARCH64_LINUX_JSON_URL" || exit 1) export AARCH64_LINUX_TARBALL="$(echo "$AARCH64_LINUX_JSON" | jq .tarball -r)" export AARCH64_LINUX_BYTESIZE="$(echo "$AARCH64_LINUX_JSON" | jq .size -r)" export AARCH64_LINUX_SHASUM="$(echo "$AARCH64_LINUX_JSON" | jq .shasum -r)" -X86_64_FREEBSD_JSON=$(curl --fail "X86_64_FREEBSD_JSON_URL" || exit 1) +X86_64_FREEBSD_JSON=$(curl --fail "$X86_64_FREEBSD_JSON_URL" || exit 1) export X86_64_FREEBSD_TARBALL="$(echo "$X86_64_FREEBSD_JSON" | jq .tarball -r)" export X86_64_FREEBSD_BYTESIZE="$(echo "$X86_64_FREEBSD_JSON" | jq .size -r)" export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)" @@ -71,7 +71,6 @@ export X86_64_FREEBSD_SHASUM="$(echo "$X86_64_FREEBSD_JSON" | jq .shasum -r)" git clone https://github.com/ziglang/www.ziglang.org --depth 1 cd www.ziglang.org export MASTER_DATE="$(date +%Y-%m-%d)" -env "../$ZIG" run update-download-page.zig s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "../$SRC_TARBALL" s3://ziglang.org/builds/