Merge branch 'develop' into fix/reifyskolemwarnings

melt-umn · Jun 30, 2020 · 5bb542e · 5bb542e
2 parents 9063504 + 74ac7a0
commit 5bb542e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/support/nailgun/sv-nailgun b/support/nailgun/sv-nailgun
@@ -9,7 +9,7 @@ fi
 export NAILGUN_PORT=$(($RANDOM + 20000))
 
 # Try a few possible locations, pick the first
-SV_NAILGUN_CANDIDATES=$(shopt -s nullglob; echo /project/melt4/People/ted/nailgun/bin/nailgun-*.jar /usr/share/java/nailgun-server*.jar /usr/share/java/nailgun-*.jar)
+SV_NAILGUN_CANDIDATES=$(shopt -s nullglob; echo /project/melt4/People/ted/nailgun/bin/nailgun-*.jar /usr/share/java/nailgun-server*.jar /usr/share/java/nailgun-*.jar /export/scratch/nailgun/bin/nailgun-server*.jar)
 SV_NAILGUN_ARRAY=($SV_NAILGUN_CANDIDATES)
 export SV_NAILGUN_JAR=${SV_NAILGUN_ARRAY[0]}
 
@@ -32,6 +32,8 @@ elif [[ -f /usr/bin/ng-nailgun ]]; then
   fi
 elif [[ -f /project/melt4/People/ted/nailgun/bin/ng ]]; then
   export SV_NAILGUN="/project/melt4/People/ted/nailgun/bin/ng"
+elif [[ -f /export/scratch/nailgun/bin/ng ]]; then
+  export SV_NAILGUN="/export/scratch/nailgun/bin/ng"
 elif [[ -f `which ng` ]]; then
   export SV_NAILGUN=`which ng`
 else