From b4261675b059ca6238d8ae8d2ab4d6feb1d8ce4c Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Fri, 20 May 2022 12:53:42 -0400
Subject: [PATCH] change license generation/display

---
 Makefile                          | 12 +++++++++++-
 build.sh                          |  6 ++++--
 license/LICENSE.index             | 22 ++++++++++++++++++----
 src/nsis/i2pbrowser-installer.nsi |  4 ++--
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index cfbeefe..8650910 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,17 @@ build/licenses: build
 	mkdir -p build/licenses
 	cp license/* build/licenses
 	cp LICENSE.md build/licenses/MIT.txt
-	unix2dos build/licenses/LICENSE.index
+	cat build/licenses/LICENSE.index \
+		build/licenses/EPL.txt \
+		build/licenses/GPL+CLASSPATH.txt \
+		build/licenses/HTTPS-Everywhere.txt \
+		build/licenses/LICENSE.tor \
+		build/licenses/MIT.txt \
+		build/licenses/MPL2.txt \
+		build/licenses/NoScript.txt \
+		build/licenses/NSS.txt \
+		build/licenses/I2P.txt > build/licenses/LICENSE.txt
+	unix2dos build/licenses/LICENSE.txt
 
 clean:
 	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version *.url make.log
diff --git a/build.sh b/build.sh
index 5752c00..c521db5 100755
--- a/build.sh
+++ b/build.sh
@@ -39,7 +39,7 @@ 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/"
+  git clone -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
 fi
 cd "$HERE/../i2p.i2p.jpackage-build/"
 for i in $COUNT; do
@@ -53,7 +53,6 @@ RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
 I2P_JARS="$I2P_PKG/lib"
 I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
-
 echo "compiling custom launcher"
 mkdir -p build
 cp "$I2P_JARS"/*.jar build
@@ -97,3 +96,6 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
   $JPACKAGE_OPTS \
   --resource-dir build \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
+
+cp "$I2P_PKG/licenses/"* licenses/
+cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" licenses/I2P.txt
\ No newline at end of file
diff --git a/license/LICENSE.index b/license/LICENSE.index
index ee3e27e..802ed6e 100644
--- a/license/LICENSE.index
+++ b/license/LICENSE.index
@@ -5,11 +5,25 @@ and they are distributed with this package in the "licenses" directory.
   1. MIT License
     * all original material in this repository
   2. Mozilla Public License 2.0(From Mozilla Installer)
-    * ./i2pbrowser-mozcompat.nsi
+    * ./src/win/i2pbrowser-mozcompat.nsi
   3. Modified BSD License(From Tor Browser Bundle)
-    * ./firefox.profile.i2p/user.js
+    * ./src/*/user.js
   4. GNU General Public License 2.0(NoScript and HTTPS Everywhere)
-    * ./firefox.profile.i2p/extensions/
+    * ./src/*/extensions/
   5. GNU General Public License 3.0(Part of HTTPS Everywhere)
-    * ./firefox.profike.i2p/extensions/https-everywhere@eff.org.xpi
+    * ./src/*/extensions/
+  6. GNU GPLv2 With Classpath Exception(Java libraries included via Jpackage)
+    * ./I2P
 
+Additionally, the Jpackaged I2P Router contains software which is licensed
+under multiple Free/Open Source Software Licenses.
+
+  ABOUT-Jetty.html               LICENSE-ECLIPSE-1.0.html             LICENSE-GPLv3.txt           LICENSE-LGPLv2.1.txt       LICENSE-SNTP.txt
+  LICENSE-Addressbook.txt        LICENSE-ElGamalDSA.txt               LICENSE-HashCash.txt        LICENSE-LGPLv3.txt         LICENSE-Undraw.txt
+  LICENSE-Apache2.0.txt          LICENSE-FatCowIcons.txt              LICENSE-I2PTunnel.txt       LICENSE-Ministreaming.txt  LICENSE-UPnP.txt
+  LICENSE-BlockFile.txt          LICENSE-Feather.txt                  LICENSE-Identicon.txt       LICENSE-NDT.txt            LICENSE-Wrapper.txt
+  LICENSE-Boost.txt              LICENSE-fontawesome.txt              LICENSE-InstallCert.txt     LICENSE-Noise.txt          LICENSE-XStream.txt
+  LICENSE-BSD.txt                LICENSE-forked-subprocess.swift.txt  LICENSE-jBCrypt.txt         LICENSE-sbt-wrapper.txt    NOTICE-Commons-Logging.txt
+  LICENSE-CC0-1.0-Universal.txt  LICENSE-Foxtrot.txt                  LICENSE-JGoodies-Forms.txt  LICENSE-Scala.md           NOTICE-Jetty.html
+  LICENSE-Cryptix.txt            LICENSE-FugueIcons.txt               LICENSE-JGoodies-Looks.txt  LICENSE-SHA256.txt         NOTICE-Tomcat.txt
+  LICENSE-DesktopGUI.txt         LICENSE-GPLv2.txt                    LICENSE-Launch4j.txt        LICENSE-SilkIcons.txt
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index b583169..61adcfb 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -36,7 +36,7 @@ SetOverwrite on
 InstallDir "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"
 
 # rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n)
-LicenseData "licenses\LICENSE.index"
+LicenseData "licenses\LICENSE.txt"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 Icon ui2pbrowser_icon.ico
@@ -129,7 +129,7 @@ RequestExecutionLevel user
 
 PageEx license
     licensetext "${LICENSE_TITLE}"
-    licensedata "licenses\LICENSE.index"
+    licensedata "licenses\LICENSE.txt"
     #PageCallbacks elevatorCallback
 PageExEnd
 PageEx directory