From 317409f6acdbf238925597c8086131d81f5f98b9 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 29 Oct 2020 18:07:06 +0100
Subject: [PATCH] Move index and out inside the user directory

---
 garlic/sh/default.nix       | 4 ++--
 garlic/sh/garlic            | 6 +++---
 garlic/stages/runexp/runexp | 4 ++--
 garlic/stages/unit.nix      | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/garlic/sh/default.nix b/garlic/sh/default.nix
index fa7f749..7c364dc 100644
--- a/garlic/sh/default.nix
+++ b/garlic/sh/default.nix
@@ -10,7 +10,7 @@
 with garlicTools;
 
 let
-  garlicOut = "/mnt/garlic/out";
+  garlicPrefix = "/mnt/garlic";
   garlicTemp = "/tmp/garlic";
 in
   stdenv.mkDerivation {
@@ -22,7 +22,7 @@ in
 
     src = ./.;
 
-    inherit garlicOut garlicTemp sshHost;
+    inherit garlicPrefix garlicTemp sshHost;
 
     installPhase = ''
       substituteAllInPlace garlic
diff --git a/garlic/sh/garlic b/garlic/sh/garlic
index a06067b..e7ccb05 100755
--- a/garlic/sh/garlic
+++ b/garlic/sh/garlic
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/bash -e
 
-garlicOut=@garlicOut@
+garlicPrefix=@garlicPrefix@
 garlicTemp=@garlicTemp@
 sshHost=@sshHost@
 PATH=@PATH@
@@ -61,7 +61,7 @@ checkExperiment() {
 do_fetch() {
   expName=$(basename $experiment)
   user=$(ssh -G "$sshHost" | awk '/^user /{print $2}')
-  exp=$garlicOut/$user/$expName
+  exp=$garlicPrefix/$user/out/$expName
 
   if [ ! -e "$exp" ]; then
     echo "missing experiment: $exp"
diff --git a/garlic/stages/runexp/runexp b/garlic/stages/runexp/runexp
index e8d9c4a..a6f5abb 100755
--- a/garlic/stages/runexp/runexp
+++ b/garlic/stages/runexp/runexp
@@ -11,9 +11,9 @@ fi
 user=$(id -un)
 group=$(id -gn)
 
-export GARLIC_OUT="/gpfs/projects/bsc15/garlic/out/$user"
+export GARLIC_OUT="/gpfs/projects/bsc15/garlic/$user/out"
 mkdir -p "$GARLIC_OUT"
-export GARLIC_INDEX="/gpfs/projects/bsc15/garlic/index/$user"
+export GARLIC_INDEX="/gpfs/projects/bsc15/garlic/$user/index"
 mkdir -p "$GARLIC_INDEX"
 export GARLIC_USER="$user"
 cd "$GARLIC_OUT"
diff --git a/garlic/stages/unit.nix b/garlic/stages/unit.nix
index 15db8fb..31fe580 100644
--- a/garlic/stages/unit.nix
+++ b/garlic/stages/unit.nix
@@ -74,10 +74,10 @@ stdenv.mkDerivation {
     rm -f "\$GARLIC_INDEX/${conf.unitName}" \
       "\$GARLIC_INDEX/${conf.expName}" 
 
-    ln -Tfs "../../out/\$GARLIC_UNIT" \
+    ln -Tfs "../out/\$GARLIC_UNIT" \
       "\$GARLIC_INDEX/${conf.unitName}"
 
-    ln -Tfs "../../out/\$GARLIC_EXPERIMENT" \
+    ln -Tfs "../out/\$GARLIC_EXPERIMENT" \
       "\$GARLIC_INDEX/${conf.expName}"
 
     if [ -e "\$GARLIC_UNIT" ]; then