force full builddir paths

buildscripts/build.sh

@@ -44,15 +44,13 @@ fi
 . "$SCRIPT_DIR/buildscripts/launcher.sh"
 
 if [ -z $I2P_VERSION ]; then 
-    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
+    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp $SCRIPT_DIR/build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
 fi
 
 echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 
 rm -rf I2P
 
-make src/I2P/config
-
 if [ ! -d "I2P" ]; then
 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
   --verbose \
@@ -63,14 +61,14 @@ if [ ! -d "I2P" ]; then
   --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
   --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
   $JPACKAGE_OPTS \
-  --resource-dir build \
+  --resource-dir $SCRIPT_DIR/build \
   --app-content src/I2P/config \
   --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
+  --input $SCRIPT_DIR/build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 fi
 
 cp "$I2P_PKG/licenses/"* license/

buildscripts/exe.sh

@@ -20,7 +20,7 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --app-content src/I2P/config \
     --app-content src/icons/windowsUIToopie2.png \
     --icon src/icons/windowsUIToopie2.png \
-    --input build \
+    --input "$SCRIPT_DIR/build" \
     --verbose \
     --type exe \
     --win-dir-chooser \

buildscripts/launcher.sh

@@ -66,10 +66,25 @@ ant jbigi
 
 cd "$SCRIPT_DIR"
 
+mkdir -p src/I2P/config
+rm -rf "src/I2P/config/geoip" "src/I2P/config/webapps" "src/I2P/config/certificates"
+cp -v "$RES_DIR/clients.config" "src/I2P/config/"
+cp -v "$RES_DIR/wrapper.config" "src/I2P/config/"
+#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
+cat router.config > src/I2P/config/router.config
+cat i2ptunnel.config > src/I2P/config/i2ptunnel.config
+cp -v "$RES_DIR/hosts.txt" "src/I2P/config/hosts.txt"
+cp -R "$RES_DIR/certificates" "src/I2P/config/certificates"
+cp -R "$RES_DIR/eepsite" "src/I2P/config/eepsite"
+mkdir -p src/I2P/config/geoip
+cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" "src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
+cp -R "$I2P_PKG/webapps" "src/I2P/config/webapps"
+cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
+
 echo "compiling custom launcher"
-mkdir -p build
+mkdir -p "$SCRIPT_DIR/build"
-cp "$I2P_JARS"/*.jar build
+cp "$I2P_JARS"/*.jar "$SCRIPT_DIR/build"
-cp "$I2P_JBIGI_JAR" build
+cp "$I2P_JBIGI_JAR" "$SCRIPT_DIR/build"
 if [ ! -f "$SCRIPT_DIR/build/jna.jar" ]; then
   wget -O "$SCRIPT_DIR/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
 fi
@@ -101,6 +116,6 @@ cd java
 cd ..
 
 #echo "building launcher.jar"
-cd build
+cd "$SCRIPT_DIR/build"
 "$JAVA_HOME"/bin/jar -cf launcher.jar net
 cd ..

buildscripts/msi.sh

@@ -21,7 +21,7 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --app-content src/I2P/config \
     --app-content src/icons/windowsUIToopie2.png \
     --icon src/icons/windowsUIToopie2.png \
-    --input build \
+    --input "$SCRIPT_DIR/build" \
     --verbose \
     --type msi \
     --win-dir-chooser \