JAL-3830 Now using a single universal bash script (jalviewc) for bash in linux, macos...

[jalview.git] / utils / install4j / install4j8_template.install4j

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index 0ab7fad..f81bab8 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -107,15 +107,11 @@
       <dirEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="files">
         <exclude>
           <entry location="jalviewc" />
-          <entry location="jalviewc-macos" />
-          <entry location="jalviewc-windows" />
           <entry location="jalviewc.ps1" />
         </exclude>
       </dirEntry>
       <dirEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/examples" overwriteMode="1" uninstallMode="2" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="examples" />
       <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc" fileMode="755" overrideFileMode="true" />
-      <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc-macos" fileMode="755" overrideFileMode="true" />
-      <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc-windows" fileMode="755" overrideFileMode="true" />
       <fileEntry mountPoint="736" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/jalviewc.ps1" fileMode="755" overrideFileMode="true" />
       <dirEntry mountPoint="884" file="${compiler:MACOS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
       <dirEntry mountPoint="885" file="${compiler:WINDOWS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
@@ -717,7 +713,7 @@ return console.askYesNo(message, true);
               </action>
               <action id="1525" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
                 <serializedBean>
-                  <property name="files" type="array" class="java.io.File" length="44">
+                  <property name="files" type="array" class="java.io.File" length="40">
                     <element index="0">
                       <object class="java.io.File">
                         <string>jre</string>
@@ -905,39 +901,19 @@ return console.askYesNo(message, true);
                     </element>
                     <element index="37">
                       <object class="java.io.File">
-                        <string>jalviewc-macos</string>
-                      </object>
-                    </element>
-                    <element index="38">
-                      <object class="java.io.File">
                         <string>jalviewc.ps1</string>
                       </object>
                     </element>
-                    <element index="39">
+                    <element index="38">
                       <object class="java.io.File">
                         <string>jalviewcv</string>
                       </object>
                     </element>
-                    <element index="40">
-                      <object class="java.io.File">
-                        <string>jalviewc-macosv</string>
-                      </object>
-                    </element>
-                    <element index="41">
+                    <element index="39">
                       <object class="java.io.File">
                         <string>jalviewc.ps1v</string>
                       </object>
                     </element>
-                    <element index="42">
-                      <object class="java.io.File">
-                        <string>jalviewc-windows</string>
-                      </object>
-                    </element>
-                    <element index="43">
-                      <object class="java.io.File">
-                        <string>jalviewc-windowsv</string>
-                      </object>
-                    </element>
                   </property>
                   <property name="recursive" type="boolean" value="true" />
                 </serializedBean>