From 84d940553855effc498c4bdfebc0b85e9973ec90 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 21 Sep 2023 21:46:30 +0200 Subject: [PATCH] linkerd: fix update script --- .../networking/cluster/linkerd/update-edge.sh | 10 +++++----- .../networking/cluster/linkerd/update-stable.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0e5be4f197e1..f9d9569b3812 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 19aa4274bed3..8643262ec3ad 100755 --- a/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi