Adding the git location as the location to place themanufacturing file

instead of the directory the target file is locatted in .

Author: madhephaestus

src/main/java/com/neuronrobotics/bowlerstudio/BowlerKernel.java

@@ -196,11 +196,12 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 				try {
 
 					File f = new File(s);
-					File parentFile = f.getParentFile();
-					if(parentFile==null) {
-						parentFile=new File(".");
+					String location;
+					try {
+						location  =ScriptingEngine.locateGitTopLevelDirectory(f).getAbsolutePath();
+					}catch(Exception ex) {
+						location= new File(".").getAbsolutePath();
 					}
-					String location  =parentFile.getAbsolutePath();
 					if(location.endsWith(".")) {
 						location=location.substring(0,location.length()-1);
 					}		
@@ -209,8 +210,8 @@ public static void runArgumentsAfterStartup(String[] args, long startTime)
 					}
 					baseWorkspaceFile = new File(location);
 
-					com.neuronrobotics.sdk.common.Log.error("Using working directory  "+baseWorkspaceFile.getAbsolutePath());
-					f=new File(baseWorkspaceFile.getAbsolutePath()+"/"+f.getName());
+					System.out.println("Using working directory  "+baseWorkspaceFile.getAbsolutePath());
+					f=new File(baseWorkspaceFile.getAbsolutePath()+"/"+s);
 					com.neuronrobotics.sdk.common.Log.error("File   "+f.getName());
 					ret = ScriptingEngine.inlineFileScriptRun(f, null);
 				} catch (Throwable e) {

src/main/java/com/neuronrobotics/bowlerstudio/scripting/ScriptingEngine.java

@@ -413,36 +413,35 @@ public static boolean isUrlAlreadyOpen(File URL) {
 
 	public static void openGit(Repository localRepo, IGitAccessor accessor) {
 		Git git = null;
-		boolean alreadyOpen= false;
+		boolean alreadyOpen = false;
 		try {
 			String absolutePath = localRepo.getDirectory().getAbsolutePath();
 			for (String s : open.keySet()) {
 				Git g = open.get(s);
-				if(g!=null)
-				if (g.getRepository().getDirectory().getAbsolutePath()
-						.contentEquals(absolutePath)) {
-					git=g;
-					alreadyOpen=true;
-					break;
-				}
+				if (g != null)
+					if (g.getRepository().getDirectory().getAbsolutePath().contentEquals(absolutePath)) {
+						git = g;
+						alreadyOpen = true;
+						break;
+					}
 			}
-			if(!alreadyOpen) {
+			if (!alreadyOpen) {
 				git = new Git(localRepo);
 				open.put(absolutePath, git);
 			}
 			if (accessor != null) {
 				try {
 					accessor.run(git);
 				} catch (Throwable t) {
-					//new IssueReportingExceptionHandler().except(t);
+					// new IssueReportingExceptionHandler().except(t);
 					throw new RuntimeException(t);
 				}
 			}
-			if(!alreadyOpen)
+			if (!alreadyOpen)
 				gitclose(git);
 		} catch (Throwable t) {
-			//new IssueReportingExceptionHandler().except(t);
-			if(!alreadyOpen)
+			// new IssueReportingExceptionHandler().except(t);
+			if (!alreadyOpen)
 				if (git != null) {
 					gitclose(git);
 				}
@@ -459,7 +458,7 @@ private static void gitclose(Git git) {
 		if (git == null)
 			return;
 		open.remove(git.getRepository().getDirectory().getAbsolutePath());
-		//git.getRepository().close();
+		// git.getRepository().close();
 		git.close();
 	}
 
@@ -1765,23 +1764,23 @@ public static String locateGitUrl(File f, Git ref) throws IOException {
 		return null;
 	}
 
-	public static void locateGit(File f, IGitAccessor access) throws IOException {
+	public static File locateGitTopLevelDirectory(File f) throws IOException {
 		File gitRepoFile = f;
 		while (gitRepoFile != null) {
 			gitRepoFile = gitRepoFile.getParentFile();
 			if (gitRepoFile != null)
 				if (new File(gitRepoFile.getAbsolutePath() + "/.git/config").exists()) {
-					// com.neuronrobotics.sdk.common.Log.error("Fount git repo for file:
-					// "+gitRepoFile);
-					Repository localRepo = new FileRepository(gitRepoFile.getAbsoluteFile() + "/.git");
-					openGit(localRepo, access);
-					return;
+					return gitRepoFile;
 				}
 		}
-
 		throw new RuntimeException("File " + f + " is not in a git repository");
 	}
 
+	public static void locateGit(File f, IGitAccessor access) throws IOException {
+		Repository localRepo = new FileRepository(locateGitTopLevelDirectory(f).getAbsoluteFile() + "/.git");
+		openGit(localRepo, access);
+	}
+
 	public static String getText(URL website) throws Exception {
 
 		URLConnection connection = website.openConnection();
@@ -2090,16 +2089,18 @@ public static List<String> getAllLangauges() {
 		}
 		return langs;
 	}
+
 	public static List<String> getAllExtentions() {
 		ArrayList<String> langs = new ArrayList<>();
 		for (String L : getLangaugesMap().keySet()) {
 			IScriptingLanguage lang = getLangaugesMap().get(L);
-			for(String s:lang.getFileExtenetion()) {
+			for (String s : lang.getFileExtenetion()) {
 				langs.add(s);
 			}
 		}
 		return langs;
 	}
+
 	public static HashMap<String, IScriptingLanguage> getLangaugesMap() {
 		return langauges;
 	}
@@ -2164,7 +2165,7 @@ public static String[] copyGitFile(String sourceGit, String targetGit, String fi
 			}
 			String[] newFileCode;
 			try {
-				System.out.println("Opening "+targetFilename+" from "+targetGit);
+				System.out.println("Opening " + targetFilename + " from " + targetGit);
 				newFileCode = ScriptingEngine.codeFromGit(targetGit, targetFilename);
 				if (newFileCode == null)
 					newFileCode = new String[] { "" };