From 38f801033e80eb27cb7bb189b6a5c616e026bb61 Mon Sep 17 00:00:00 2001 From: knaccc Date: Sat, 2 Feb 2019 02:28:47 +0000 Subject: [PATCH] fixed Mac app --- README.md | 2 +- bin/build-launcher.sh | 21 +++++++------------ resources/i2p-zero.app/Contents/Info.plist | 2 +- .../i2p-zero.app/Contents/MacOS/launch-gui.sh | 6 ------ .../Contents/MacOS/tunnel-control.sh | 3 --- 5 files changed, 10 insertions(+), 24 deletions(-) delete mode 100755 resources/i2p-zero.app/Contents/MacOS/launch-gui.sh delete mode 100755 resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh diff --git a/README.md b/README.md index edeaaf0..e28c3e9 100755 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ or `dist/linux/router/bin/launch-gui.sh` To run the MacOS router, type: `dist/mac/router/bin/launch.sh` -or `dist/mac/router/bin/launch-gui.sh` +or run the app located in `dist/mac/router-app/i2p-zero.app` For Windows, run: diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index c6c1963..bca6c31 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -43,25 +43,15 @@ for i in linux mac win; do $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:import/javafx-jmods/$i/javafx-jmods-${JAVAFX_VERSION}:target/modules:target/org.getmonero.i2p.zero.jar:target/org.getmonero.i2p.zero.gui.jar --add-modules org.getmonero.i2p.zero,org.getmonero.i2p.zero.gui,javafx.controls,javafx.fxml,java.desktop --output dist/$i-gui/router --strip-debug --compress 2 --no-header-files --no-man-pages done -cp -R $basedir/resources/i2p-zero.app $basedir/dist/mac-gui/router/bin/ - for i in linux mac linux-gui mac-gui; do - if [ $i = mac-gui ]; then - mac_root=$basedir/dist/$i/router/bin/i2p-zero.app/Contents/MacOS - cp $basedir/resources/tunnel-control.sh $mac_root/ - mv $basedir/dist/$i/router/bin/java $mac_root/ - mv $basedir/dist/$i/router/bin/jrunscript $mac_root/ - mv $basedir/dist/$i/router/bin/keytool $mac_root/ - else - cp $basedir/resources/launch.sh $basedir/dist/$i/router/bin/ - cp $basedir/resources/tunnel-control.sh $basedir/dist/$i/router/bin/ - fi + cp $basedir/resources/launch.sh $basedir/dist/$i/router/bin/ + cp $basedir/resources/tunnel-control.sh $basedir/dist/$i/router/bin/ done for i in win win-gui; do cp $basedir/resources/launch.bat $basedir/dist/$i/router/bin/ done -for i in linux-gui; do +for i in linux-gui mac-gui; do cp $basedir/resources/launch-gui.sh $basedir/dist/$i/router/bin/ done for i in win-gui; do @@ -82,6 +72,11 @@ for i in linux mac win linux-gui mac-gui win-gui; do done done +mkdir -p $basedir/dist/mac-gui/router-app/ +cp -R $basedir/resources/i2p-zero.app $basedir/dist/mac-gui/router-app/ +mv $basedir/dist/mac-gui/router/* $basedir/dist/mac-gui/router-app/i2p-zero.app/Contents/MacOS/ +rm -fr $basedir/dist/mac-gui/router + du -sk dist/* | awk '{printf "%.1f MB %s\n",$1/1024,$2}' echo "*** Done ***" diff --git a/resources/i2p-zero.app/Contents/Info.plist b/resources/i2p-zero.app/Contents/Info.plist index 41d660d..07ed59f 100644 --- a/resources/i2p-zero.app/Contents/Info.plist +++ b/resources/i2p-zero.app/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleGetInfoString i2p-zero CFBundleExecutable - launch-gui.sh + bin/launch-gui.sh CFBundleIdentifier org.getmonero.i2p.zero.gui CFBundleName diff --git a/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh b/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh deleted file mode 100755 index 5233d7d..0000000 --- a/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -wd=${0%/*} -cd "$wd" -basedir="$wd/../../../.." -./java -cp $basedir/i2p.base/jbigi.jar -m org.getmonero.i2p.zero.gui --i2p.dir.base.template=$basedir/i2p.base diff --git a/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh b/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh deleted file mode 100755 index 24ad902..0000000 --- a/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec 3<>/dev/tcp/localhost/30000; echo "$1 $2 $3" >&3; cat <&3 \ No newline at end of file