diff -Naur "icedtea-web-master (copy)/launchers/build.sh" icedtea-web-master/launchers/build.sh
--- "icedtea-web-master (copy)/launchers/build.sh" 2020-05-07 21:52:58.000000000 +0200
+++ icedtea-web-master/launchers/build.sh 2020-05-10 12:43:53.550337991 +0200
@@ -129,7 +129,7 @@
-e "s|[@]MICRO_VERSION[@]|$MICRO_VERSION|g" \
-e "s/[@]PACKAGE_VERSION[@]/$PACKAGE_VERSION/g" \
$WIN_INSTALLER_DIR/installer.json.in > $TARGET_TMP/itw-installer.json
- "$JRE/bin/java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs
+ "java" -jar "$WIXGEN_JAR" "$TARGET_IMAGES/`imageName $WIN_SUFFIX`" -c $TARGET_TMP/itw-installer.json -o $TARGET_TMP/itw-installer.wxs
pushd $TARGET_TMP
"$WIX_TOOLSET_DIR/candle.exe" -nologo itw-installer.wxs
"$WIX_TOOLSET_DIR/light.exe" -nologo -sval -ext WixUIExtension itw-installer.wixobj
diff -Naur "icedtea-web-master (copy)/launchers/configure.sh" icedtea-web-master/launchers/configure.sh
--- "icedtea-web-master (copy)/launchers/configure.sh" 2020-05-07 21:40:57.000000000 +0200
+++ icedtea-web-master/launchers/configure.sh 2020-05-10 12:44:06.163463501 +0200
@@ -75,7 +75,7 @@
if [ "x$ITW_LIBS" == "xDISTRIBUTION" ] ; then
readonly JAVAWS_SRC=`ls $PROJECT_TOP/artifact-no-dependencies/target/icedtea-web-no-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded`
- readonly OPTIONS_COMMAND="$JRE/bin/java -cp
+ readonly OPTIONS_COMMAND="java -cp
`ls $PROJECT_TOP/artifact-all-dependencies/target/icedtea-web-all-dependencies-*.jar | grep -v sources | grep -v javadoc | grep -v shaded`
net.adoptopenjdk.icedteaweb.commandline.CommandLineOptionsDefinition" ;
else
diff -Naur "icedtea-web-master (copy)/launchers/utils.sh" icedtea-web-master/launchers/utils.sh
--- "icedtea-web-master (copy)/launchers/utils.sh" 2020-05-07 21:44:56.000000000 +0200
+++ icedtea-web-master/launchers/utils.sh 2020-05-10 12:45:32.689324481 +0200
@@ -140,7 +140,7 @@
local WIN_LOC_OVERWRITE="-Duser.language=$ID -Duser.country=$COUNTRY -Dfile.encoding=$ENCOD"
fi
mkdir -p $langDir
- "$JRE"/bin/java \
+ java \
$WIN_LOC_OVERWRITE \
-cp `createCp $JAVAWS_SRC` \
net.sourceforge.jnlp.util.docprovider.TextsProvider \