X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j8_template.install4j;h=53f7853bb7df43968b6d1c1028450fe47aff646a;hb=2319ef1a410ce35bf2ef1800fd0be4e779ee44eb;hp=25dd895f204f3d2b64a229c937c9a02f228cec44;hpb=4e77b06eaad21132a66cdcaf7b13341ebad620aa;p=jalview.git diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index 25dd895..53f7853 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -1,6 +1,6 @@ - - + + @@ -13,6 +13,7 @@ + @@ -32,8 +33,11 @@ - - + + + + + @@ -53,7 +57,31 @@ - + + + *.dylib + *.so + *.jnilib + unpack200 + tnameserv + servertool + rmiregistry + rmid + policytool + pack200 + orbd + keytool + jjs + java + jspawnhelper + libfreetype.dylib.6 + applet + jaotc + jfr + jrunscript + libjli.dylib + + @@ -77,8 +105,13 @@ - + + + + + + @@ -112,7 +145,7 @@ - + @@ -211,6 +244,35 @@ + + + + + String userHome = (String)context.getVariable("sys.userHome"); + +String[] tryPaths = new String[] { + "bin", + ".local" + File.separator + "bin", + "local" + File.separator + "bin", + "opt" + File.separator + "bin" +}; + +for (int i = 0; i < tryPaths.length; i++) { + String tryPath = tryPaths[i]; + File unixUserBinDir = new File(userHome + File.separator + tryPath); + if (unixUserBinDir.exists()) { + return tryPath; + } +} + +return null; + + + + unixUserBinDir + + Util.isLinux() || Util.isUnixInstaller() + @@ -457,7 +519,7 @@ return console.askOkCancel(message, true); - Creating file associations + Finished creating file associations @@ -471,19 +533,19 @@ return console.askOkCancel(message, true); - 737 + JALVIEW jalview - 737 + JALVIEW jalviews - 737 + JALVIEW ${compiler:EXTRA_SCHEME} @@ -555,6 +617,44 @@ return console.askOkCancel(message, true); context.getBooleanVariable("addToDockAction") + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:WRAPPER_LINK} + + + + !Util.isWindows() + + + + + ${installer:sys.contentDir}\${compiler:WRAPPER_SCRIPT_BIN_DIR} + Path + + context.getBooleanVariable("appendToPathAction") + + + + + + ${installer:sys.contentDir}/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT} + + + + + ${installer:sys.userHome}/${installer:unixUserBinDir}/${compiler:WRAPPER_LINK} + + + + context.getBooleanVariable("makeSymbolicLink") && ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + @@ -577,6 +677,22 @@ return console.askOkCancel(message, true); Util.isMacOS() + + + Add ${compiler:JALVIEW_APPLICATION_NAME}'s bin folder to the Path environment variable + + appendToPathAction + + Util.isWindows() + + + + Make a ${compiler:WRAPPER_LINK} symbolic link in ~/${installer:unixUserBinDir} + + makeSymbolicLink + + ( Util.isLinux() || Util.isUnixInstaller() ) && ( context.getVariable("unixUserBinDir") != null ) + @@ -679,7 +795,7 @@ return console.askYesNo(message, true); - + jre @@ -860,6 +976,26 @@ return console.askYesNo(message, true); build_* + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR} + + + + + bin + + + + + channel.props + + + + + channel.propsv + + @@ -1119,7 +1255,7 @@ return console.askYesNo(message, true); - + @@ -1135,7 +1271,7 @@ return console.askYesNo(message, true); - + @@ -1151,10 +1287,11 @@ return console.askYesNo(message, true); - + + - + @@ -1170,7 +1307,7 @@ return console.askYesNo(message, true); - + @@ -1186,7 +1323,7 @@ return console.askYesNo(message, true); - +