From a8a16c1361849c09cd47a0fed70d10f2dbba4ba6 Mon Sep 17 00:00:00 2001
From: Brainedia <187246+brainedia@users.noreply.github.com>
Date: Tue, 12 Dec 2017 11:02:11 +0100
Subject: [PATCH] Workaround for bug occuring when having spaces in path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When having spaces somewhere in the path to the current working directory or the file that's going to be compiled, parsejava (/Applications/CodeRunner.app/Contents/SharedSupport/Developer/bin/parsejava) can't deal with that and says "The file “xyz.java” couldn’t be opened because there is no such file."
---
 Java.crLanguage/Scripts/compile.sh | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/Java.crLanguage/Scripts/compile.sh b/Java.crLanguage/Scripts/compile.sh
index 476c62c..f275a62 100644
--- a/Java.crLanguage/Scripts/compile.sh
+++ b/Java.crLanguage/Scripts/compile.sh
@@ -33,9 +33,13 @@ enc[1]="ASCII"			# ASCII
 
 directory=`dirname "$0"`
 
+originalWorkingDirectory="$PWD"
+cp "$PWD/$CR_FILENAME" "$CR_TMPDIR/$CR_FILENAME"
+cd "$CR_TMPDIR"
+
 # Check if file resides in a folder with package name, if so, change directory
 package=`"$CR_DEVELOPER_DIR/bin/parsejava" --package "$PWD/$CR_FILENAME" 2>/dev/null`
-if [ ${#package} -ne 0 ]; then
+if [ $? -eq 0 ] && [ ${#package} -ne 0 ]; then
 	# Check if package name is in the form package.subpackage.subpackage
 	# If this structure matches directory structure, change directory...
 	packageDirectory=`echo "$package" | sed 's/\./\//g'`
@@ -61,17 +65,6 @@ elif [ ! -z $CR_SANDBOXED ] && [ ! -r "$PWD" ]; then
 	cd "$tmp"
 fi
 
-javac "$CR_FILENAME" -encoding ${enc[$CR_ENCODING]} "${@:1}" ${CR_DEBUGGING:+-g}
-status=$?
-
-if [ $status -ne 0 ]; then
-	javac -version &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo -e "\nTo run Java code, you need to install a JDK. You can download a JDK at http://oracle.com/technetwork/java/javase/downloads/\n\nIf you see a prompt asking you to install Java, it may not include the necessary components for compiling Java code. Therefore, use the link above to download and install a JDK."
-	fi
-	exit $status
-fi
-
 # Use parsejava to get package and class name of main function.
 out=`"$CR_DEVELOPER_DIR/bin/parsejava" "$PWD/$CR_FILENAME" 2>/dev/null`
 status=$?
@@ -85,4 +78,17 @@ if [ $status -ne 0 ]; then
 	fi
 fi
 
-echo "$PWD:$out"
\ No newline at end of file
+cd "$originalWorkingDirectory";
+
+javac "$CR_FILENAME" -encoding ${enc[$CR_ENCODING]} "${@:1}" ${CR_DEBUGGING:+-g}
+status=$?
+
+if [ $status -ne 0 ]; then
+	javac -version &>/dev/null
+	if [ $? -ne 0 ]; then
+		echo -e "\nTo run Java code, you need to install a JDK. You can download a JDK at http://oracle.com/technetwork/java/javase/downloads/\n\nIf you see a prompt asking you to install Java, it may not include the necessary components for compiling Java code. Therefore, use the link above to download and install a JDK."
+	fi
+	exit $status
+fi
+
+echo "$PWD:$out"