From: Ben Soares Date: Fri, 14 Jun 2024 17:37:28 +0000 (+0100) Subject: JAL-3631 Removed old non-user launcher. Labelled USERSPACE actions. X-Git-Tag: Release_2_11_4_0~24^2~37 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=297ea17e43543bd55182dbd258f06f05d25b094b;p=jalview.git JAL-3631 Removed old non-user launcher. Labelled USERSPACE actions. --- diff --git a/utils/install4j/install4j10_template.install4j b/utils/install4j/install4j10_template.install4j index 5c76953..85e9326 100644 --- a/utils/install4j/install4j10_template.install4j +++ b/utils/install4j/install4j10_template.install4j @@ -138,40 +138,8 @@ - - - - - - - - - - - - - - - - - - - - - ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} - - - - - - - - - - - - - + + @@ -190,6 +158,17 @@ + + # Enter one VM parameter per line +# For example, to adjust the maximum memory usage to 512 MB, uncomment the following line: +# -Xmx512m +# To include another file, uncomment the following line: +# -include-options [path to other .vmoption file] + +# Uncomment these two lines to disable user-space automatic updates. +#-Dnousedefaultappdir=true +#-Dsilent=noupdate + ${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")} @@ -344,10 +323,10 @@ - + - + @@ -355,8 +334,8 @@ ArrayList<String> tryPaths = new ArrayList<> (); tryPaths.add(userHome + File.separator + "bin"); -tryPaths.add(userHome + File.separator + ".local" + File.separator + "bin"); tryPaths.add(userHome + File.separator + "local" + File.separator + "bin"); +tryPaths.add(userHome + File.separator + ".local" + File.separator + "bin"); tryPaths.add(userHome + File.separator + "opt" + File.separator + "bin"); if (Util.isMacOS()) { // && root permission? @@ -377,7 +356,13 @@ return null; unixUserBinDir - Util.isLinux() || Util.isUnixInstaller() || Util.isMacOS() + !Util.hasFullAdminRights() +&& +( + Util.isLinux() + || Util.isUnixInstaller() + || Util.isMacOS() +) @@ -679,31 +664,31 @@ return console.askOkCancel(message, true); - 737 + 2823 jalview - 737 + 2823 jalviews - 737 + 2823 jalviewhttp - 737 + 2823 jalviewhttps - JALVIEW + 2823 ${compiler:EXTRA_SCHEME} @@ -718,7 +703,7 @@ return console.askOkCancel(message, true); - + @@ -734,7 +719,7 @@ return console.askOkCancel(message, true); Util.isLinux() - + @@ -750,7 +735,7 @@ return console.askOkCancel(message, true); Util.isLinux() - + ${compiler:APPLICATION_CATEGORIES} @@ -772,9 +757,11 @@ return console.askOkCancel(message, true); - !context.getBooleanVariable("sys.programGroupDisabled") + !Util.hasFullAdminRights() +&& +!context.getBooleanVariable("sys.programGroupDisabled") - + ${compiler:JALVIEW_APPLICATION_NAME} @@ -795,9 +782,11 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("createDesktopLinkAction") + !Util.hasFullAdminRights() +&& +context.getBooleanVariable("createDesktopLinkAction") - + @@ -805,9 +794,21 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("addToDockAction") + !Util.hasFullAdminRights() +&& +context.getBooleanVariable("addToDockAction") - + + + + ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} + Path + + !Util.hasFullAdminRights() +&& +context.getBooleanVariable("appendToPathAction") + + @@ -820,17 +821,13 @@ return console.askOkCancel(message, true); - Util.isLinux() || Util.isUnixInstaller() || Util.isMacOS() - - - - - ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} - Path - - context.getBooleanVariable("appendToPathAction") + ( + Util.isLinux() + || Util.isUnixInstaller() + || Util.isMacOS() +) - + @@ -843,9 +840,18 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("makeUserSymbolicLinkAction") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + !Util.hasFullAdminRights() +&& +( + context.getBooleanVariable("makeUserSymbolicLinkAction") + && ( + Util.isLinux() + || Util.isUnixInstaller() + ) + && context.getVariable("unixUserBinDir") != null +) - + @@ -858,7 +864,14 @@ return console.askOkCancel(message, true); - context.getBooleanVariable("makeUserSymbolicLinkAction") && Util.isMacOS() && ( context.getVariable("unixUserBinDir") != null ) && ( context.getVariable("macWrapperLinkLocation") != null ) + !Util.hasFullAdminRights() +&& +( + Util.isMacOS() + && context.getBooleanVariable("makeUserSymbolicLinkAction") + && context.getVariable("unixUserBinDir") != null + && context.getVariable("macWrapperLinkLocation") != null +) @@ -904,7 +917,6 @@ return console.askOkCancel(message, true); ${i18n:CreateDesktopIcon} - createDesktopLinkAction !Util.isMacOS() @@ -925,13 +937,23 @@ return console.askOkCancel(message, true); Util.isWindows() - + Make a ${compiler:WRAPPER_LINK} symbolic link in ${installer:unixUserBinDir} makeUserSymbolicLinkAction - ( Util.isLinux() || Util.isUnixInstaller() || ( Util.isMacOS() && ( context.getVariable("macWrapperLinkLocation") != null ) ) ) && ( context.getVariable("unixUserBinDir") != null ) + !Util.hasFullAdminRights() +&& +( + Util.isLinux() + || Util.isUnixInstaller() + || ( + Util.isMacOS() + && context.getVariable("macWrapperLinkLocation") != null + ) + ) + && context.getVariable("unixUserBinDir") != null @@ -1598,9 +1620,6 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - - - @@ -1654,9 +1673,6 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - - - @@ -1672,9 +1688,6 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - - - @@ -1690,9 +1703,6 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - - - @@ -1704,9 +1714,6 @@ ${compiler:JALVIEW_APPLICATION_NAME} will now launch. - - -