diff --git a/garlic/stages/isolate/default.nix b/garlic/stages/isolate/default.nix index dc074e1f..b8c07224 100644 --- a/garlic/stages/isolate/default.nix +++ b/garlic/stages/isolate/default.nix @@ -26,9 +26,6 @@ stdenv.mkDerivation { desc = "# $out\n" + (if builtins.hasAttr "desc" nextStage then nextStage.desc else ""); out = "$out"; installPhase = '' - - echo PATH=$PATH - substituteAllInPlace stage1 substituteAllInPlace stage2 diff --git a/garlic/stages/isolate/stage1 b/garlic/stages/isolate/stage1 index 02ed71b1..eab02746 100644 --- a/garlic/stages/isolate/stage1 +++ b/garlic/stages/isolate/stage1 @@ -1,7 +1,7 @@ -#!/bin/bash -ex +#!/bin/bash -e ->&2 echo Running isolate stage1 ->&2 echo PATH=$PATH +#>&2 echo Running isolate stage1 +#>&2 echo PATH=$PATH if [ -e /nix ]; then >&2 echo "/nix found, aborting" @@ -42,5 +42,5 @@ mounts=( join_flags="${mounts[@]}" -exec $nixjoin -v -i $join_flags $nixhome -- \ +exec $nixjoin -i $join_flags $nixhome -- \ env -i "${env[@]}" @out@/bin/stage2 diff --git a/garlic/stages/isolate/stage2 b/garlic/stages/isolate/stage2 index a4ae039d..bc89412e 100644 --- a/garlic/stages/isolate/stage2 +++ b/garlic/stages/isolate/stage2 @@ -1,7 +1,7 @@ -#!/bin/sh -ex +#!/bin/sh -e ->&2 echo Running isolate stage2 ->&2 echo PATH=$PATH +#>&2 echo Running isolate stage2 +#>&2 echo PATH=$PATH if [ ! -e /nix ]; then >&2 echo "/nix not found, aborting" diff --git a/garlic/stages/runexp/runexp b/garlic/stages/runexp/runexp index 5b929a5c..1d615159 100755 --- a/garlic/stages/runexp/runexp +++ b/garlic/stages/runexp/runexp @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e if [ -e /nix ]; then >&2 echo "Cannot use runexp inside nix environment!" diff --git a/garlic/stages/sbatch.nix b/garlic/stages/sbatch.nix index 74f696d2..d46c1803 100644 --- a/garlic/stages/sbatch.nix +++ b/garlic/stages/sbatch.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cat > $out/job < $out/run < $out <