Allow setting module path.

tschaub · May 30, 2012 · 129f7a9 · 129f7a9
1 parent d5f08da
commit 129f7a9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/bin/geoscript b/bin/geoscript
@@ -49,15 +49,20 @@ else
     CLASS=org.geoscript.js.GeoScriptShell
 fi
 
+ARGS=
+if [ -x $MODULES ]; then
+    ARGS="-Dgeoscript.modules=$MODULES"
+fi
+
 if [ $# -eq 1 ]; then
     # resolve absolute path to main module
     MAIN_PATH=$(
         cd -P -- "$(dirname -- "$1")" \
         && pwd -P
     ) && MAIN_PATH=$MAIN_PATH/$(basename -- "$1")
 
-    java -cp $CP $CLASS -main $MAIN_PATH
+    java -cp $CP $ARGS $CLASS -main $MAIN_PATH
 else
-    java -cp $CP $CLASS
+    java -cp $CP $ARGS $CLASS
 fi
 
diff --git a/src/main/java/org/geoscript/js/GeoScriptModules.java b/src/main/java/org/geoscript/js/GeoScriptModules.java
@@ -6,12 +6,14 @@
 public class GeoScriptModules {
 
     public static String getModulePath() {
-        URL moduleUrl = GeoScriptModules.class.getResource("lib");
+        String modulePath = System.getProperty("geoscript.modules");
-        String modulePath;
+        if (modulePath == null) {
-        try {
+            URL moduleUrl = GeoScriptModules.class.getResource("lib");
-            modulePath = moduleUrl.toURI().toString();
+            try {
-        } catch (URISyntaxException e) {
+                modulePath = moduleUrl.toURI().toString();
-            throw new RuntimeException("Trouble evaluating GeoScript module path.", e);
+            } catch (URISyntaxException e) {
+                throw new RuntimeException("Trouble evaluating GeoScript module path.", e);
+            }
         }
         return modulePath;
     }