git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #141658 from superherointj/package-updateScript-fix3

update script fix #3 for fluxcd, k3s, linode-cli, linkerd

commit13b2a8a11856ab8ba50d83a8431084724490b34e authorRyan Mulligan <ryan@ryantm.com> dateThu 14 Oct 2021, 11:36 (5 years ago) parent486c7c2875bb31
5 files changed+24−17
compare with master
unifiedsplit
pkgs/applications/networking/cluster/fluxcd/update.sh+11−4 pkgs/applications/networking/cluster/k3s/update.sh+2−2 pkgs/applications/networking/cluster/linkerd/update-edge.sh+3−3 pkgs/applications/networking/cluster/linkerd/update-stable.sh+6−6 pkgs/tools/virtualization/linode-cli/update.sh+2−2
pkgs/applications/networking/cluster/fluxcd/update.sh+11−4
@@ -1,7 +1,7 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl gnugrep gnused jq
33
4−set -eu -o pipefail
4+set -x -eu -o pipefail
55
66cd $(dirname "${BASH_SOURCE[0]}")
77
@@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi
1414SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz)
1515
1616setKV () {
17− sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
17+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
1818}
1919
2020setKV version ${VERSION}
@@ -24,8 +24,15 @@ setKV vendorSha256 ""
2424
2525cd ../../../../../
2626set +e
27−VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g')
27+VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
2828set -e
2929
3030cd - > /dev/null
31−setKV vendorSha256 ${VENDOR_SHA256}
31+
32+if [ -n "${VENDOR_SHA256:-}" ]; then
33+ setKV vendorSha256 ${VENDOR_SHA256}
34+else
35+ echo "Update failed. VENDOR_SHA256 is empty."
36+ exit 1
37+fi
38+
pkgs/applications/networking/cluster/k3s/update.sh+2−2
@@ -1,7 +1,7 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl gnugrep gnused jq
33
4−set -eu -o pipefail
4+set -x -eu -o pipefail
55
66WORKDIR=$(mktemp -d)
77trap "rm -rf ${WORKDIR}" EXIT
@@ -45,7 +45,7 @@ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
4545 "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
4646
4747setKV () {
48− sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
48+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
4949}
5050
5151setKV k3sVersion ${K3S_VERSION}
pkgs/applications/networking/cluster/linkerd/update-edge.sh+3−3
@@ -1,7 +1,7 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl gnugrep gnused jq
33
4−set -eu -o pipefail
4+set -x -eu -o pipefail
55
66cd $(dirname "$0")
77
@@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^edge-//')
1414SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
1515
1616setKV () {
17− sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./edge.nix
17+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./edge.nix
1818}
1919
2020setKV version ${VERSION}
@@ -25,9 +25,9 @@ cd ../../../../../
2525set +e
2626VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
2727set -e
28+cd - > /dev/null
2829
2930if [ -n "${VENDOR_SHA256:-}" ]; then
30− cd - > /dev/null
3131 setKV vendorSha256 ${VENDOR_SHA256}
3232else
3333 echo "Update failed. VENDOR_SHA256 is empty."
pkgs/applications/networking/cluster/linkerd/update-stable.sh+6−6
@@ -1,7 +1,7 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl gnugrep gnused jq
33
4−set -eu -o pipefail
4+set -x -eu -o pipefail
55
66cd $(dirname "$0")
77
@@ -14,7 +14,7 @@ VERSION=$(echo ${TAG} | sed 's/^stable-//')
1414SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linkerd/linkerd2/archive/refs/tags/${TAG}.tar.gz)
1515
1616setKV () {
17− sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
17+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
1818}
1919
2020setKV version ${VERSION}
@@ -25,11 +25,11 @@ cd ../../../../../
2525set +e
2626VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g')
2727set -e
28+cd - > /dev/null
2829
2930if [ -n "${VENDOR_SHA256:-}" ]; then
30− cd - > /dev/null
31− setKV vendorSha256 ${VENDOR_SHA256}
31+ setKV vendorSha256 ${VENDOR_SHA256}
3232else
33− echo "Update failed. VENDOR_SHA256 is empty."
34− exit 1
33+ echo "Update failed. VENDOR_SHA256 is empty."
34+ exit 1
3535fi
pkgs/tools/virtualization/linode-cli/update.sh+2−2
@@ -1,7 +1,7 @@
11#!/usr/bin/env nix-shell
22#!nix-shell -i bash -p curl gnugrep gnused jq yq-go
33
4−set -eu -o pipefail
4+set -x -eu -o pipefail
55
66cd $(dirname "${BASH_SOURCE[0]}")
77
@@ -21,7 +21,7 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
2121SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz)
2222
2323setKV () {
24− sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix
24+ sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix
2525}
2626
2727setKV specVersion ${SPEC_VERSION}