From e19ce19368fcce7df9453029f3dcaca39e12f164 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Tue, 3 Jan 2023 17:57:27 +0000
Subject: [PATCH] change the icon used in the jpackage builds on Windows

---
 build.sh    | 7 +++++--
 launcher.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index c3d2394..6ab5c1b 100755
--- a/build.sh
+++ b/build.sh
@@ -25,6 +25,8 @@ if [ -z $machine ]; then
   esac
 fi
 
+ICON="src/icons/ui2pbrowser_icon.ico"
+
 if [ "$machine" = "Mac" ]; then
   rm -rf I2P
   ./getprebuilt.sh
@@ -33,6 +35,8 @@ elif [ "$machine" = "Linux" ]; then
   rm -rf I2P
   ./getprebuilt.sh
   exit 0
+elif [ "$machine" = "unix" ]; then
+  ICON=src/icons/windowsUIToopie2.png
 fi
 
 . "$SCRIPT_DIR/launcher.sh"
@@ -62,8 +66,7 @@ if [ ! -d "I2P" ]; then
   --app-content src/unix/torbrowser.sh \
   --app-content src/win/torbrowser-windows.sh \
   --app-content src/icons/windowsUIToopie2.png \
-  --app-content src/icons/ui2pbrowser_icon.ico \
-  --icon src/icons/windowsUIToopie2.png \
+  --icon "${ICON}" \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 fi
 
diff --git a/launcher.sh b/launcher.sh
index da39fce..7c909c9 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -49,7 +49,7 @@ for i in $COUNT; do
   echo -n "$i...."; sleep 1s
 done
 ant distclean pkg || true
-ant jbigi-windows-only
+ant jbigi
 
 cd "$HERE"
 export I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"