From af9c2460e9ea4f5b480e64420c1e2f3170572829 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Tue, 17 May 2022 16:12:43 -0400
Subject: [PATCH] use jsign

---
 .gitignore                       |  3 ++-
 build.sh                         |  7 ++++--
 i2pversion                       |  6 ++---
 sign.sh                          | 40 ++++++++++++++++++++++++++++++++
 src/nsis/i2pbrowser-jpackage.nsi |  2 +-
 5 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 sign.sh

diff --git a/.gitignore b/.gitignore
index 673f7f5..7ecfb06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ i2pversion_override
 *.exe
 *.log
 cmd
-*.so
\ No newline at end of file
+*.so
+*.jar
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 6f9ec6d..c3e3b1d 100755
--- a/build.sh
+++ b/build.sh
@@ -31,12 +31,15 @@ fi
 if [ -z "${JAVA_HOME}" ]; then
   JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
 fi
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+fi
 echo "Building with: $JAVA, $JAVA_HOME"
 sleep 5s
 
 HERE="$PWD"
 if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
-  git clone https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
+  git clone --depth 1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
 fi
 cd "$HERE/../i2p.i2p.jpackage-build/"
 git pull --tags
@@ -54,7 +57,7 @@ I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
 
 echo "compiling custom launcher"
-mkdir build
+mkdir -p build
 cp "$I2P_JARS"/*.jar build
 if [ ! -f "$HERE/build/jna.jar" ]; then
   wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
diff --git a/i2pversion b/i2pversion
index abcab87..dafc8b4 100644
--- a/i2pversion
+++ b/i2pversion
@@ -1,14 +1,14 @@
 #! /usr/bin/env sh
 
 JNA_VERSION=5.11.0
-export JNA_VERSION=$JNA_VERSION
+export JNA_VERSION=5.11.0
 
 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
 I2P_VERSION=1.7.7
-export I2P_VERSION=$I2P_VERSION
+export I2P_VERSION=1.7.7
 VERSION=i2p-jpackage-1.7.1
-export VERSION="$VERSION"
+export VERSION=i2p-jpackage-1.7.1
 
 #Uncomment this to build from the tip of the master.
 #I2P_VERSION=1.8.0
diff --git a/sign.sh b/sign.sh
new file mode 100644
index 0000000..b33c5d2
--- /dev/null
+++ b/sign.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. i2pversion
+
+if [ -f i2pversion_override ]; then
+    . i2pversion_override
+fi
+
+. config.sh
+
+if [ -f config_overide.sh ]; then
+    . config_override.sh
+fi
+
+linuxsign() {
+    if [ ! -f jsign-4.1.jar ]; then
+        wget -O jsign-4.1.jar https://github.com/ebourg/jsign/releases/download/4.1/jsign-4.1.jar
+    fi
+    java -jar jsign-4.1.jar \
+    -keystore "$JAVA_HOME/lib/security/cacerts" \
+    -storepass changeit \
+    -keyfile "$HOME/signingkeys/signing-key.jks" \
+    -keypass changeit \
+    -tsaurl "http://timestamp.sectigo.com" \
+    -name "I2P-Browser-Installer" \
+    -alg "SHA-512" \
+    "$1"
+}
+
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+    linuxsign I2P-Profile-Installer-$I2P_VERSION.exe
+    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+else
+    signtool sign "I2P-Profile-Installer-$I2P_VERSION.exe"
+    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+fi
+
+
+
diff --git a/src/nsis/i2pbrowser-jpackage.nsi b/src/nsis/i2pbrowser-jpackage.nsi
index 87a7a0b..63ed7a3 100644
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@@ -1 +1 @@
-!define I2P_VERSION 1.7.5
+!define I2P_VERSION 2P_VERSION