Skip to content

Commit

Permalink
Fix JAVA installation folder back to original java
Browse files Browse the repository at this point in the history
  • Loading branch information
@herrtunante
herrtunante committed Jul 6, 2023
1 parent 73b3b7e commit 98cc9ed
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
</substitutionList>
</substitute>
<showInfo>
<text>Please QUIT THE COLLECT EARTH WINDOW before proceeding with the update! The update will fail if Collect Earth is running!</text>
<text>You need to quit Collect Earth and re-start it for the update to finalize!</text>
</showInfo>
</postInstallationActionList>
<compressionAlgorithm>lzma</compressionAlgorithm>
Expand Down
32 changes: 16 additions & 16 deletions collect-earth/collect-earth-installer/src/main/resources/java.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<folderList>
<folder>
<description>Java binaries - Microsoft Windows</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_windows</name>
<platforms>windows-x64 windows</platforms>
<distributionFileList>
Expand All @@ -32,7 +32,7 @@
</folder>
<folder>
<description>Java binaries - Linux</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_linux</name>
<platforms>linux</platforms>
<distributionFileList>
Expand All @@ -47,7 +47,7 @@
</folder>
<folder>
<description>Java binaries - Linux-x64</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_linux_x64</name>
<platforms>linux-x64</platforms>
<distributionFileList>
Expand All @@ -62,7 +62,7 @@
</folder>
<folder>
<description>Java binaries - Solaris Sparc</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_solaris_sparc</name>
<platforms>solaris-sparc</platforms>
<distributionFileList>
Expand All @@ -77,7 +77,7 @@
</folder>
<folder>
<description>Java binaries - Solaris Intel</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_solaris_intel</name>
<platforms>solaris-intel</platforms>
<distributionFileList>
Expand All @@ -92,7 +92,7 @@
</folder>
<folder>
<description>Java binaries - Mac OS X</description>
<destination>${installdir}/jre11</destination>
<destination>${installdir}/java</destination>
<name>java_osx</name>
<platforms>osx</platforms>
<distributionFileList>
Expand Down Expand Up @@ -134,11 +134,11 @@
<!-- determine Java binary name - javaw.exe on Windows, java otherwise -->
<setInstallerVariable>
<name>java_executable</name>
<value>${installdir}/jre11/bin/java</value>
<value>${installdir}/java/bin/java</value>
</setInstallerVariable>
<setInstallerVariable>
<name>java_executable</name>
<value>${installdir}/jre11/bin/javaw.exe</value>
<value>${installdir}/java/bin/javaw.exe</value>
<ruleList>
<platformTest type="windows" />
</ruleList>
Expand All @@ -156,12 +156,12 @@
</if>
</readyToInstallActionList>

<!-- START - THIS IS ONLY NECESSARY WHEN MOVING FROM JRE8 to JRE11 -->
<!-- START - THIS IS ONLY NECESSARY WHEN MOVING FROM JRE8 to java -->
<preInstallationActionList>
<actionGroup>
<actionList>
<showWarning>
<text>You must close the application ${project.fullName} before launching the updater otherwise the process will fail!</text>
<text>Please QUIT THE COLLECT EARTH WINDOW before proceeding with the update! The update will fail if Collect Earth is running!</text>
</showWarning>
</actionList>
<ruleList>
Expand All @@ -173,22 +173,22 @@

<postInstallationActionList>
<!-- change permissions of all binaries -->
<changePermissions files="${installdir}/jre11/bin/*" permissions="0755" abortOnError="0" showMessageOnError="0">
<changePermissions files="${installdir}/java/bin/*" permissions="0755" abortOnError="0" showMessageOnError="0">
<ruleList>
<fileExists path="${installdir}/jre11/bin" />
<fileExists path="${installdir}/java/bin" />
<platformTest negate="1" type="windows" />
</ruleList>
</changePermissions>
<createSymLink target="../libjsig.so" linkName="${installdir}/jre11/lib/libjsig.so" abortOnError="false" showMessageOnError="false">
<createSymLink target="../libjsig.so" linkName="${installdir}/java/lib/libjsig.so" abortOnError="false" showMessageOnError="false">
<ruleList>
<platformTest type="linux" />
<fileTest condition="exists" path="${installdir}/jre11/lib/libjsig.so" />
<fileTest condition="exists" path="${installdir}/java/lib/libjsig.so" />
</ruleList>
</createSymLink>
<createSymLink target="../libjsig.so" linkName="${installdir}/jre11/lib/server/libjsig.so" abortOnError="false" showMessageOnError="false">
<createSymLink target="../libjsig.so" linkName="${installdir}/java/lib/server/libjsig.so" abortOnError="false" showMessageOnError="false">
<ruleList>
<platformTest type="linux" />
<fileTest condition="exists" path="${installdir}/jre11/lib/server/libjsig.so" />
<fileTest condition="exists" path="${installdir}/java/lib/server/libjsig.so" />
</ruleList>
</createSymLink>

Expand Down

0 comments on commit 98cc9ed

Please sign in to comment.