From c13fd768349524bbc0195bc99d8daeb94ce2b50f Mon Sep 17 00:00:00 2001
From: Jethro Grassie <jtg@xtrabass.com>
Date: Wed, 16 Jan 2019 14:16:07 -0500
Subject: [PATCH] tweaks for mac

---
 .gitignore                     | 4 +++-
 bin/build-launcher.sh          | 9 +++++++--
 bin/build-original-i2p.sh      | 7 ++++++-
 bin/convert-jars-to-modules.sh | 7 ++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a06796..fe73ea6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 out/
 target/
 .idea/
-*.swp
\ No newline at end of file
+*.swp
+dist/
+import/
diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh
index 677233e..c2ef72d 100755
--- a/bin/build-launcher.sh
+++ b/bin/build-launcher.sh
@@ -2,7 +2,12 @@
 
 basedir=$(dirname $(dirname $(readlink -fm $0)))
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 # convert the jar files from an existing I2P build into modules suitable for use with jlink
 $basedir/bin/convert-jars-to-modules.sh
@@ -48,4 +53,4 @@ zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-linux-*
 zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-freebsd-*
 
 echo "*** Done ***"
-echo "To run, type: dist/linux/router/bin/launch.sh"
\ No newline at end of file
+echo "To run, type: dist/linux/router/bin/launch.sh"
diff --git a/bin/build-original-i2p.sh b/bin/build-original-i2p.sh
index 6df6142..82ac11c 100755
--- a/bin/build-original-i2p.sh
+++ b/bin/build-original-i2p.sh
@@ -4,7 +4,12 @@ basedir=$(dirname $(dirname $(readlink -fm $0)))
 
 cd $basedir/import
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 
 # build the jars we're going to modularize
diff --git a/bin/convert-jars-to-modules.sh b/bin/convert-jars-to-modules.sh
index c661004..22ed72e 100755
--- a/bin/convert-jars-to-modules.sh
+++ b/bin/convert-jars-to-modules.sh
@@ -2,7 +2,12 @@
 
 basedir=$(dirname $(dirname $(readlink -fm $0)))
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 jarPaths=`find $basedir/import/lib -name '*.jar'`