From 98eacf030d8090b53133751f6d22de3380632429 Mon Sep 17 00:00:00 2001
From: Nicolas Vannieuwkerke <nicolas.vannieuwkerke@ugent.be>
Date: Wed, 8 Jun 2022 16:27:48 +0200
Subject: [PATCH 1/2] fix for singularity cache for vsc_ugent profile

---
 conf/vsc_ugent.config | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/conf/vsc_ugent.config b/conf/vsc_ugent.config
index f2558fc..6c79590 100644
--- a/conf/vsc_ugent.config
+++ b/conf/vsc_ugent.config
@@ -19,6 +19,10 @@ singularity {
     cacheDir = "$scratch_dir/singularity"
 }
 
+env {
+    SINGULARITY_CACHEDIR=$scratch_dir/.singularity
+}
+
 // Define profiles for each cluster
 profiles {
     skitty {
@@ -35,7 +39,6 @@ profiles {
             executor = 'slurm'
             queue = 'skitty'
             maxRetries = 2
-            beforeScript = "export SINGULARITY_CACHEDIR=$scratch_dir/.singularity"
             scratch = "$scratch_dir"
         }
     }
@@ -54,7 +57,6 @@ profiles {
             executor = 'slurm'
             queue = 'swalot'
             maxRetries = 2
-            beforeScript = "export SINGULARITY_CACHEDIR=$scratch_dir/.singularity"
             scratch = "$scratch_dir"
         }
     }
@@ -73,7 +75,6 @@ profiles {
             executor = 'slurm'
             queue = 'victini'
             maxRetries = 2
-            beforeScript = "export SINGULARITY_CACHEDIR=$scratch_dir/.singularity"
             scratch = "$scratch_dir"
         }
     }
@@ -92,7 +93,6 @@ profiles {
             executor = 'slurm'
             queue = 'kirlia'
             maxRetries = 2
-            beforeScript = "export SINGULARITY_CACHEDIR=$scratch_dir/.singularity"
             scratch = "$scratch_dir"
         }
     }
@@ -111,7 +111,6 @@ profiles {
             executor = 'slurm'
             queue = 'doduo'
             maxRetries = 2
-            beforeScript = "export SINGULARITY_CACHEDIR=$scratch_dir/.singularity"
             scratch = "$scratch_dir"
         }
     }

From b6d38859f0e5ca95a5a18fc362e3386d2de0c56b Mon Sep 17 00:00:00 2001
From: Nicolas Vannieuwkerke <nicolas.vannieuwkerke@ugent.be>
Date: Wed, 8 Jun 2022 16:28:28 +0200
Subject: [PATCH 2/2] fix for singularity cache for vsc_ugent profile

---
 conf/vsc_ugent.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/vsc_ugent.config b/conf/vsc_ugent.config
index 6c79590..6875f19 100644
--- a/conf/vsc_ugent.config
+++ b/conf/vsc_ugent.config
@@ -20,7 +20,7 @@ singularity {
 }
 
 env {
-    SINGULARITY_CACHEDIR=$scratch_dir/.singularity
+    SINGULARITY_CACHEDIR="$scratch_dir/.singularity"
 }
 
 // Define profiles for each cluster