summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2017-05-30 16:02:49 +0200
committerGitHub <noreply@github.com>2017-05-30 16:02:49 +0200
commit9e313b8c584ca14ce0528426699f7bff563eb6f0 (patch)
treede8f71e40a6107af59032ac6dd8f56fca1d49074
parent7f3642a828726e1570b1a9975979e058753c6969 (diff)
parente457a083df052035d53b33b24aab5fad849ca982 (diff)
Merge pull request #129 from matthiasbeyer/fix-128HEADv0.3.3master
Fix bug when building non-switch and appending channel hash
-rwxr-xr-xnix-script-switch.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/nix-script-switch.sh b/nix-script-switch.sh
index 69a04fb..547a2c9 100755
--- a/nix-script-switch.sh
+++ b/nix-script-switch.sh
@@ -186,6 +186,12 @@ dbg "ARGS = $ARGS"
[[ ! -d "$WD" ]] && stderr "No directory: $WD" && exit 1
+[[ "$COMMAND" != "switch" ]] && [[ $APPEND_CHANNEL_GEN == 1 ]] && {
+ stderr "Cannot append channel generation if non-switch build,"
+ stderr "as this is currently not supported."
+ exit 1
+}
+
TAG_TARGET=$(__quiet__ __git "$WD" rev-parse HEAD)
stdout "Tag in config will be generated at '$TAG_TARGET'"