X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j9_template.install4j;fp=utils%2Finstall4j%2Finstall4j9_template.install4j;h=f1726f33770bc35d7e1100bd6975ca2f200b0c9e;hb=fcbbbb8ac87d03b30009ac90935357e19bdcd3cd;hp=f01ed8e7a3c8bfba957c805e2b85c21b8cb20070;hpb=935a6e1d7804ebbc66039e315ea187c60516b1c1;p=jalview.git
diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j
index f01ed8e..f1726f3 100644
--- a/utils/install4j/install4j9_template.install4j
+++ b/utils/install4j/install4j9_template.install4j
@@ -704,7 +704,7 @@ return console.askOkCancel(message, true);
- context.getBooleanVariable("makeSymbolicLink") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null )
+ context.getBooleanVariable("makeSymbolicLinkAction") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null )
@@ -719,7 +719,7 @@ return console.askOkCancel(message, true);
- context.getBooleanVariable("makeSymbolicLink") && ( Util.isMacOS() ) && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null )
+ context.getBooleanVariable("makeSymbolicLinkAction") && Util.isMacOS() && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null )
@@ -734,6 +734,7 @@ return console.askOkCancel(message, true);
createDesktopLinkAction
+ !Util.isMacOS()
@@ -755,9 +756,9 @@ return console.askOkCancel(message, true);
Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixUserBinDir}
- makeSymbolicLink
+ makeSymbolicLinkAction
- ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null )
+ ( Util.isLinux() || Util.isUnixInstaller() || ( Util.isMacOS() && ( context.getVariable("macWrapperLinkLocation") != null ) ) ) && ( context.getVariable("unixUserBinDir") != null )
@@ -1100,8 +1101,13 @@ return console.askYesNo(message, true);
-
+
+
+
+
${compiler:WRAPPER_LINK}_setup
${compiler:sys.fullName}
@@ -1115,7 +1121,46 @@ return console.askYesNo(message, true);
-
+
+
+ Running ${i18n:SetupAppTitle}
+
+
+
+
+
+
+
+
+ ${i18n:FinishedLabel(${compiler:JALVIEW_APPLICATION_NAME})}
+
+
+
+
+ ${i18n:AddToDock}
+
+ addToDockAction
+
+ Util.isMacOS()
+
+
+
+ Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixUserBinDir}
+
+ makeSymbolicLinkAction
+
+ ( Util.isLinux() || Util.isUnixInstaller() || ( Util.isMacOS() && ( context.getVariable("macWrapperLinkLocation") != null ) ) ) && ( context.getVariable("unixUserBinDir") != null )
+
+
+
+
+${i18n:ClickFinish}
+
+${compiler:JALVIEW_APPLICATION_NAME} will now launch.
+
+
+
+
@@ -1387,7 +1432,7 @@ return console.askYesNo(message, true);
-
+