From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 6 Mar 2020 17:35:11 +0000 (+0000)
Subject: JAL-3394 Added Categories=Science;Biology;Java; to unix shell installer .desktop... 
X-Git-Tag: Develop-2_11_2_0-d20201215~58^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c484ce0509810f1703969b605e13bf8e6c103be6;p=jalview.git

JAL-3394 Added Categories=Science;Biology;Java; to unix shell installer .desktop file
---

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index 4f37185..8a0ea4f 100644
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -126,22 +126,7 @@
         <id>2350</id>
         <id>2450</id>
       </macStaticAssociationActions>
-      <infoPlist>${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")}</infoPlist>
-      <iconImageFiles>
-        <file path="${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png" />
-      </iconImageFiles>
-    </launcher>
-    <launcher name="${compiler:JALVIEW_NAME} package" id="1876" menuName="${compiler:sys.shortName} ${compiler:JALVIEW_VERSION}" fileset="1873">
-      <executable name="${compiler:sys.shortName}" iconSet="true" redirectStderr="false" failOnStderrOutput="false" executableMode="gui" changeWorkingDirectory="false" singleInstance="true" />
-      <java mainClass="jalview.bin.Launcher" vmParameters="-Dinstaller_template_version=${compiler:INSTALLER_TEMPLATE_VERSION}">
-        <classPath>
-          <scanDirectory location="${compiler:GETDOWN_DIST_DIR}" failOnError="false" />
-        </classPath>
-      </java>
-      <macStaticAssociationActions mode="selected">
-        <id>2350</id>
-        <id>2450</id>
-      </macStaticAssociationActions>
+      <desktopFile>Categories=Science;Biology;Java;</desktopFile>
       <infoPlist>${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")}</infoPlist>
       <iconImageFiles>
         <file path="${compiler:JALVIEW_DIR}/resources/images/JalviewLogo_Huge.png" />
@@ -1196,8 +1181,9 @@ return console.askYesNo(message, true);
         <entry filesetId="880" />
         <entry filesetId="882" />
         <entry filesetId="1873" />
+        <entry filesetId="2105" />
       </exclude>
-      <jreBundle jreBundleSource="preCreated" includedJre="${compiler:LINUX_JAVA_VM_TGZ}" manualJreEntry="true" />
+      <jreBundle includedJre="${compiler:LINUX_JAVA_VM_TGZ}" manualJreEntry="true" />
     </unixArchive>
   </mediaSets>
   <buildIds>