From 29701f0d4bd7f80989b0a3095d44d2dd8e1644bd Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Mon, 6 May 2019 14:54:23 +0100
Subject: [PATCH] JAL-3247 improvements

---
 build.gradle                                 |    1 +
 utils/install4j/install4j_template.install4j |   25 +++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac71cd3..2f50c3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -773,6 +773,7 @@ task getdownDigest(type: JavaExec) {
   classpath file(jalviewDir + '/' + getdown_lib1)
   main = "com.threerings.getdown.tools.Digester"
   args project.ext.getdownWebsiteDir
+  inputs.dir(project.ext.getdownWebsiteDir)
   outputs.file(project.ext.getdownWebsiteDir + '/' + "digest2.txt")
 }
 
diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j
index cf00519..176a72c 100644
--- a/utils/install4j/install4j_template.install4j
+++ b/utils/install4j/install4j_template.install4j
@@ -654,7 +654,7 @@ return console.askOkCancel(message, true);
             <preActivation />
             <postActivation />
             <actions>
-              <action name="" id="573" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateDesktopLinkAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
+              <action name="" id="573" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateDesktopLinkAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make desktop link">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateDesktopLinkAction">
@@ -662,11 +662,16 @@ return console.askOkCancel(message, true);
                         <boolean>false</boolean>
                       </void>
                       <void property="description">
-                        <string>Jalview Desktop</string>
+                        <string>${compiler:sys.shortName}</string>
                       </void>
                       <void property="name">
                         <string>${compiler:sys.fullName}</string>
                       </void>
+                      <void property="unixIconFile">
+                        <object class="com.install4j.api.beans.ExternalFile">
+                          <string>../../resources/images/JalviewLogo_Huge.png</string>
+                        </object>
+                      </void>
                       <void property="winIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
                           <string>../../resources/images/JalviewLogo_Huge.png</string>
@@ -677,14 +682,6 @@ return console.askOkCancel(message, true);
                 </serializedBean>
                 <condition>context.getBooleanVariable("createDesktopLinkAction")</condition>
               </action>
-              <action name="" id="575" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.AddStartupItemAction" enabled="false" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
-                <serializedBean>
-                  <java class="java.beans.XMLDecoder">
-                    <object class="com.install4j.runtime.beans.actions.desktop.AddStartupItemAction" />
-                  </java>
-                </serializedBean>
-                <condition />
-              </action>
               <action name="" id="576" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.AddToDockAction" enabled="true" commentSet="false" comment="" actionElevationType="none" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
@@ -699,7 +696,7 @@ return console.askOkCancel(message, true);
                 </serializedBean>
                 <condition>context.getBooleanVariable("addToDockAction")</condition>
               </action>
-              <action name="" id="578" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
+              <action name="" id="578" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvp file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
@@ -710,7 +707,7 @@ return console.askOkCancel(message, true);
                         <string>jvp</string>
                       </void>
                       <void property="launcherId">
-                        <string>121</string>
+                        <string>737</string>
                       </void>
                       <void property="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
@@ -733,7 +730,7 @@ return console.askOkCancel(message, true);
                 </serializedBean>
                 <condition />
               </action>
-              <action name="" id="1604" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="">
+              <action name="" id="1604" customizedId="" beanClass="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction" enabled="true" commentSet="false" comment="" actionElevationType="elevated" rollbackBarrier="false" rollbackBarrierExitCode="0" multiExec="false" failureStrategy="1" errorMessage="Could not make .jvl file association">
                 <serializedBean>
                   <java class="java.beans.XMLDecoder">
                     <object class="com.install4j.runtime.beans.actions.desktop.CreateFileAssociationAction">
@@ -744,7 +741,7 @@ return console.askOkCancel(message, true);
                         <string>jvl</string>
                       </void>
                       <void property="launcherId">
-                        <string>1608</string>
+                        <string>737</string>
                       </void>
                       <void property="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-- 
1.7.10.2