adjust base dir & scripts for excution outside koans dir

nurous · Nov 3, 2011 · 528c385 · 528c385
1 parent a8e458f
commit 528c385
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 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,8 @@
 package com.sandwich.util.io.directories;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 
 abstract class DirectorySet {
 
@@ -39,14 +41,18 @@ public String getDataDir(){
 	}
 
 	private static String createBaseDir() {
-		File dir = new File(".");
-		dir = new File(dir.getAbsolutePath().replace("%20", " "));
-		if (dir.exists()) {
-			dir = dir.getParentFile();
+		try {
+			URL path = DirectorySet.class.getClassLoader().getResource(".");
+			File dir = new File(path.toURI());
 			if (dir.exists()) {
-		         dir = dir.getParentFile();
+				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.bat b/koans/run.bat
@@ -5,6 +5,7 @@ javac -version
 if ERRORLEVEL 3 goto no_javac
 java -version
 if ERRORLEVEL 1 goto no_java
+mkdir "%~dp0\bin"
 cls
 java -classpath "%~dp0\bin;%~dp0\lib\koans.jar" com.sandwich.koan.runner.AppLauncher %1 %2 %3 %4 %5 %6 %7 %8 %9
 

diff --git a/koans/run.sh b/koans/run.sh
@@ -1,3 +1,4 @@
-clear
 DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+mkdir "$DIR"/bin
+clear
 java -classpath "$DIR"/bin:"$DIR"/lib/koans.jar com.sandwich.koan.runner.AppLauncher "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"