From 993a0da9e7a22329ed83496bac0180808d0c873b Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sat, 27 Apr 2024 00:16:47 +0200 Subject: [PATCH] Pass flakeref to release script explicitly --- release.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/release.sh b/release.sh index 93766d0..27aebe4 100755 --- a/release.sh +++ b/release.sh @@ -3,19 +3,18 @@ set -euo pipefail IFS=$'\n\t' -SYSTEM=x86_64-linux +flakeref="${1-}" +name="${2-}" -name="${1-}" - -if [ -z "$name" ]; +if [ -z "$flakeref" ] || [ -z "$name" ]; then - echo "Usage: $0 NAME" + echo "Usage: $0 FLAKEREF NAME" exit 1 fi -imagename=$(nix eval --no-allow-dirty --raw .#packages.$SYSTEM.$name.imageName) -imagetag=$(nix eval --no-allow-dirty --raw .#packages.$SYSTEM.$name.imageTag) -image=$(nix build --no-allow-dirty .#packages.$SYSTEM.$name --print-out-paths --no-link) +imagename=$(nix eval --no-allow-dirty --raw $flakeref.imageName) +imagetag=$(nix eval --no-allow-dirty --raw $flakeref.imageTag) +image=$(nix build --no-allow-dirty $flakeref --print-out-paths --no-link) gitrev=$(git rev-parse HEAD) docker load < $image