Index: /issm/trunk/cron/nightlyrun.sh
===================================================================
--- /issm/trunk/cron/nightlyrun.sh	(revision 4910)
+++ /issm/trunk/cron/nightlyrun.sh	(revision 4911)
@@ -39,4 +39,15 @@
 
 #Get configuration
+#Check that no other nightly run is running {{{1
+if [ "$(ps aux | grep "nighltyrun\.sh" | grep -v "grep")" ]
+then
+	echo "WARNING: A nightly run is already running. Killing..."
+
+	for JOBID in $(ps aux | grep "nighltyrun\.sh" | grep -v "grep" | awk '{printf("%s\n",$2);}');
+	do
+		kill -9 $JOBID;
+	done;
+fi
+#}}}
 #Source config file{{{1
 if [ $# -ne 1 ];