can now execute outside script directory in *nix

nurous · Nov 4, 2011 · 938a1bd · 938a1bd
1 parent 81b3d7b
commit 938a1bd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/koans-lib/src/com/sandwich/util/io/directories/DirectorySet.java b/koans-lib/src/com/sandwich/util/io/directories/DirectorySet.java
@@ -1,6 +1,10 @@
 package com.sandwich.util.io.directories;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import com.sandwich.koan.util.ApplicationUtils;
 
 abstract class DirectorySet {
 
@@ -39,14 +43,21 @@ public String getDataDir(){
 	}
 
 	private static String createBaseDir() {
-		File dir = new File(".");
-		dir = new File(dir.getAbsolutePath().replace("%20", " "));
-		if (dir.exists()) {
-			dir = dir.getParentFile();
+		URL path = DirectorySet.class.getClassLoader().getResource(".");
+		try {
+			File dir = new File(path.toURI());
+			if(ApplicationUtils.isWindows()){
+				dir = new File(dir.getAbsolutePath().replace("%20", " "));
+			}
 			if (dir.exists()) {
 				dir = dir.getParentFile();
+				if (dir.exists()) {
+					dir = dir.getParentFile();
+				}
 			}
+			return dir.getAbsolutePath();
+		} catch (URISyntaxException e) {
+			throw new RuntimeException(e);
 		}
-		return dir.getAbsolutePath();
 	}
 }
diff --git a/koans/lib/koans.jar b/koans/lib/koans.jar
diff --git a/koans/run.sh b/koans/run.sh
@@ -1,2 +1,3 @@
 clear
-java -classpath bin:lib/koans.jar com.sandwich.koan.runner.AppLauncher "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
+DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+java -classpath "$DIR"/bin:"$DIR"/lib/koans.jar com.sandwich.koan.runner.AppLauncher "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"