From f6de9fd731b9ac6f7c659d6acb93174a2047dde0 Mon Sep 17 00:00:00 2001
From: Mathis Rosenhauer <rosenhauer@dkrz.de>
Date: Wed, 27 Sep 2017 17:16:40 +0200
Subject: [PATCH] Escaping and cleanup
---
startvnc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/startvnc b/startvnc
index 563e107..a1f519e 100755
--- a/startvnc
+++ b/startvnc
@@ -125,7 +125,7 @@ clean_up () {
if [[ -n ${job_id:-} ]]; then
echo "Removing job ${job_id}."
ssh_frontend "scancel -Q ${job_id}; sleep 1; \
- cd .startvnc && rm -f out.${job_id}"
+ cd .startvnc && rm -f out.${job_id} nodelist_${job_id}.txt"
else
echo "Job ID not available. Make sure the vncjob is not running!"
ssh_frontend "squeue -u ${SVNC_USERNAME}"
@@ -225,7 +225,7 @@ ${sbatch_resources}
#SBATCH --dkrzepilog=0
cd \${HOME}
scontrol show hostname \${SLURM_JOB_NODELIST} | \
- awk '{print $0":00";print $0":01";print$0":02";print $0":03"}' > \
+ awk '{print \$0":0";print \$0":1";print \$0":2";print \$0":3"}' > \
.startvnc/nodelist_\${SLURM_JOB_ID}.txt
/opt/TurboVNC/bin/vncserver -fg -geometry "${SVNC_GEOMETRY}" -localhost
EOF
--
GitLab