From a6224d342f1861f601f2efc5f6d9234b74d5f6bf Mon Sep 17 00:00:00 2001
From: ville rantanen <ville.rantanen@helsinki.fi>
Date: Fri, 12 Sep 2014 13:12:21 +0300
Subject: [PATCH] correct cake usage

---
 anduril/slurm-maxfree | 6 ++++--
 anduril/slurm-random  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/anduril/slurm-maxfree b/anduril/slurm-maxfree
index 6e8edc0..0485bee 100755
--- a/anduril/slurm-maxfree
+++ b/anduril/slurm-maxfree
@@ -105,11 +105,13 @@ echo 'exit $EC' >> "$JOBFILE"
 [[ -e "$JOBROOT"/.lastdel ]] || touch "$JOBROOT"/.lastdel
 if test "$( find $JOBROOT/.lastdel -mmin +30 )"
 then touch "$JOBROOT"/.lastdel
-     find "$JOBROOT" -maxdepth 2 -mindepth 2 -type f -mtime +10 -delete
+     find "$JOBROOT" -maxdepth 2 -mindepth 2 -type f -mtime +20 -delete
      find "$JOBROOT" -type d -depth -empty -delete
 fi
 ) &
 
 echo "The job file is in $JOBFILE"
 # send the job
-srun --nodelist=${NODELIST[$INDEX]} slurm-cake "$JOBFILE"
+srun --nodelist=${NODELIST[$INDEX]} slurm-cake "$JOBFILE" "$JOBFILE"
+
+wait
diff --git a/anduril/slurm-random b/anduril/slurm-random
index 10667a6..58b754d 100755
--- a/anduril/slurm-random
+++ b/anduril/slurm-random
@@ -100,13 +100,13 @@ echo 'exit $EC' >> "$JOBFILE"
 [[ -e "$JOBROOT"/.lastdel ]] || touch "$JOBROOT"/.lastdel
 if test "$( find $JOBROOT/.lastdel -mmin +30 )"
 then touch "$JOBROOT"/.lastdel
-     find "$JOBROOT" -maxdepth 2 -mindepth 2 -type f -mtime +10 -delete
+     find "$JOBROOT" -maxdepth 2 -mindepth 2 -type f -mtime +20 -delete
      find "$JOBROOT" -type d -depth -empty -delete
 fi
 ) &
 
 echo "The job file is in $JOBFILE"
 # send the job
-srun --nodelist=${NODELIST[$INDEX]} slurm-cake "$JOBFILE"
+srun --nodelist=${NODELIST[$INDEX]} slurm-cake "$JOBFILE" "$JOBFILE"
 
 wait