Merge pull request #696 from tilmankamp/issue678

Fix #678; copying keep directory into right target directory
mozilla · Jul 5, 2017 · 08ff89c · 08ff89c
2 parents 449adf3 + 63d528b
commit 08ff89c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bin/enqueue.sh b/bin/enqueue.sh
@@ -92,17 +92,19 @@ elif [ -f "$RUN_DIR" ]; then
   exit 1
 fi
 mkdir -p "$RUN_DIR/src"
-mkdir -p "$RUN_DIR/results/keep"
+mkdir -p "$RUN_DIR/results"
 
 # copying local tree into "src" sub-directory of run directory
 # excluding .git
 rsync -av . "$RUN_DIR/src" --exclude=/.git
 
 # copying over "keep" data from continue run directory
 if [ "$CONTINUE_DIR" ]; then
-    cp -rf "$CONTINUE_DIR/results/keep" "$RUN_DIR/results/keep"
+    cp -rf "$CONTINUE_DIR/results/keep" "$RUN_DIR/results/"
 fi
 
+mkdir -p "$RUN_DIR/results/keep"
+
 # patch-creating job.sbatch file from job-template with our parameters
 sed \
     -e "s/__ID__/$HASH/g" \