From 80ccd1240a29ecd18cb6ce5f4a135f98931b1659 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Wed, 14 Oct 2020 16:29:22 +0200
Subject: [PATCH] Less verbose execution

---
 garlic/stages/isolate/default.nix | 3 ---
 garlic/stages/isolate/stage1      | 8 ++++----
 garlic/stages/isolate/stage2      | 6 +++---
 garlic/stages/runexp/runexp       | 2 +-
 garlic/stages/sbatch.nix          | 4 ++--
 garlic/stages/srun.nix            | 2 +-
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/garlic/stages/isolate/default.nix b/garlic/stages/isolate/default.nix
index dc074e1..b8c0722 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 02ed71b..eab0274 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 a4ae039..bc89412 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 5b929a5..1d61515 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 74f696d..d46c180 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 <<EOF
-    #!/bin/sh -ex
+    #!/bin/sh -e
     #SBATCH --job-name="${jobName}"
     ''
     + sbatchOpt "ntasks" ntasks
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     EOF
     
     cat > $out/run <<EOF
-    #!/bin/sh -ex
+    #!/bin/sh -e
     ${slurm}/bin/sbatch ${nixPrefix}$out/job
     EOF
     chmod +x $out/run
diff --git a/garlic/stages/srun.nix b/garlic/stages/srun.nix
index cfabc5c..f0b33fd 100644
--- a/garlic/stages/srun.nix
+++ b/garlic/stages/srun.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   dontPatchShebangs = true;
   installPhase = ''
     cat > $out <<EOF
-    #!/bin/sh -ex
+    #!/bin/sh -e
     exec ${slurm}/bin/srun \
       --mpi=pmi2 \
       --cpu-bind=${cpuBind} \