From d6269701670e5b6caf3b5d2672bcce9205f343e2 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathaniel.gray@sap.com>
Date: Tue, 26 Sep 2017 11:41:15 -0700
Subject: [PATCH 1/2] Quote unquoted paths

---
 genswift.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/genswift.sh b/genswift.sh
index 5d6d3a8..098436e 100755
--- a/genswift.sh
+++ b/genswift.sh
@@ -10,16 +10,16 @@
 # need to compile with the new-to-Java8 option -parameters.
 #
 
-export JAVA_HOME=${JAVA_HOME?-Please export JAVA_HOME}
+export JAVA_HOME="${JAVA_HOME?-Please export JAVA_HOME}"
 
 FILTER="${1:-java/lang|java/util|java/sql|java/awt|javax/swing}"
 
 FILTER="$(echo "$FILTER" | sed 's@[._]@/@g' | sed 's@\$@\\$@g')"
 
-TARGET_JAR=${2:-$JAVA_HOME/jre/lib/rt.jar}
+TARGET_JAR="${2:-$JAVA_HOME/jre/lib/rt.jar}"
 
 PACKAGE_ORDER=${3:-java/lang|java/util|java/sql|java/awt|javax/swing}
 
-cd "$(dirname "$0")/src" && $JAVA_HOME/bin/javac -d ../bin genswift.java && cd .. &&
+cd "$(dirname "$0")/src" && "$JAVA_HOME/bin/javac" -d ../bin genswift.java && cd .. &&
 
-$JAVA_HOME/bin/jar tf "$TARGET_JAR" | egrep "^($FILTER)" | sed "s@\\.class\$@@" | $JAVA_HOME/bin/java -cp "$TARGET_JAR:bin" genswift "$PACKAGE_ORDER"
+"$JAVA_HOME/bin/jar" tf "$TARGET_JAR" | egrep "^($FILTER)" | sed "s@\\.class\$@@" | "$JAVA_HOME/bin/java" -cp "$TARGET_JAR:bin" genswift "$PACKAGE_ORDER"

From f98a24691dce6b50f1144bcc3bf45a1fe07c0d10 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathaniel.gray@sap.com>
Date: Tue, 26 Sep 2017 12:12:08 -0700
Subject: [PATCH 2/2] Don't assume `bin` folder exists

---
 genswift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/genswift.sh b/genswift.sh
index 098436e..cdd2e15 100755
--- a/genswift.sh
+++ b/genswift.sh
@@ -20,6 +20,6 @@ TARGET_JAR="${2:-$JAVA_HOME/jre/lib/rt.jar}"
 
 PACKAGE_ORDER=${3:-java/lang|java/util|java/sql|java/awt|javax/swing}
 
-cd "$(dirname "$0")/src" && "$JAVA_HOME/bin/javac" -d ../bin genswift.java && cd .. &&
+cd "$(dirname "$0")/src" && mkdir -p ../bin && "$JAVA_HOME/bin/javac" -d ../bin genswift.java && cd .. &&
 
 "$JAVA_HOME/bin/jar" tf "$TARGET_JAR" | egrep "^($FILTER)" | sed "s@\\.class\$@@" | "$JAVA_HOME/bin/java" -cp "$TARGET_JAR:bin" genswift "$PACKAGE_ORDER"