From c0cc04d550929696ce4be92d55b7e2b125c37261 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:40:08 -0300 Subject: [PATCH 1/3] linode-cli: fix escape on updateScript --- pkgs/tools/virtualization/linode-cli/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/tools/virtualization/linode-cli/update.sh index 281d0e1df97..b31aa957423 100755 --- a/pkgs/tools/virtualization/linode-cli/update.sh +++ b/pkgs/tools/virtualization/linode-cli/update.sh @@ -21,7 +21,7 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) setKV () { - sed -i "s/$1 = \".*\"/$1 = \"$2\"/" default.nix + sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix } setKV specVersion ${SPEC_VERSION} From 39f00331dd68f1eca9dfdb68292a94ae03dac1aa Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:40:23 -0300 Subject: [PATCH 2/3] k3s: fix escape on updateScript --- pkgs/applications/networking/cluster/k3s/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index db895af71c6..c0afe1041f7 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -44,8 +44,9 @@ CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") + setKV () { - sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix } setKV k3sVersion ${K3S_VERSION} From bf2a70691bbe7572caf94b7cf809ed689edac767 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 2 Oct 2021 13:40:37 -0300 Subject: [PATCH 3/3] fluxcd: fix escape on updateScript --- pkgs/applications/networking/cluster/fluxcd/update.sh | 2 +- pkgs/applications/networking/cluster/k3s/update.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/update.sh b/pkgs/applications/networking/cluster/fluxcd/update.sh index f463370e669..c1ce4b38156 100755 --- a/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -14,7 +14,7 @@ SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archi SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz) setKV () { - sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix } setKV version ${VERSION} diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index c0afe1041f7..79432f06c23 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -44,7 +44,6 @@ CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \ CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") - setKV () { sed -i "s|$1 = \".*\"|$1 = \"$2\"|" ./default.nix }