From 79f016cb1ccf09df833487de55dd1d03fbb6d846 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 3 Jan 2023 19:26:04 +0000 Subject: [PATCH] switch to git archive for tarball, include ico and png in app-content to make NSIS builds work --- build.sh | 1 + launcher.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6ab5c1b..22587c1 100755 --- a/build.sh +++ b/build.sh @@ -66,6 +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 "${ICON}" \ --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher fi diff --git a/launcher.sh b/launcher.sh index 7c909c9..2686c55 100755 --- a/launcher.sh +++ b/launcher.sh @@ -41,7 +41,8 @@ sleep 5s HERE="$PWD" if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then git clone --depth=1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/" - tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/" + git archive --format=tar.gz --output=i2p.i2p.jpackage-build.tar.gz "$VERSION" + #tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/" fi cd "$HERE/../i2p.i2p.jpackage-build/" git pull --all