X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2Finstall4j%2Finstall4j8_template.install4j;h=53f7853bb7df43968b6d1c1028450fe47aff646a;hb=efba321f20b819819c0b1cd9c9133d9d1a2ab314;hp=a0f3dc89420084c145de61fcb5fd30abff9b6b86;hpb=be537cc6cdddc2d0e17877371bb53e93feeee4ce;p=jalview.git diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index a0f3dc8..53f7853 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -1,6 +1,6 @@ - - + + @@ -33,8 +33,11 @@ - - + + + + + @@ -73,6 +76,10 @@ jspawnhelper libfreetype.dylib.6 applet + jaotc + jfr + jrunscript + libjli.dylib @@ -82,14 +89,12 @@ - - @@ -97,16 +102,19 @@ - - + + + + + + - @@ -134,15 +142,10 @@ - - - - - - + @@ -241,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() + @@ -487,7 +519,7 @@ return console.askOkCancel(message, true); - Creating file associations + Finished creating file associations @@ -501,19 +533,19 @@ return console.askOkCancel(message, true); - 737 + JALVIEW jalview - 737 + JALVIEW jalviews - 737 + JALVIEW ${compiler:EXTRA_SCHEME} @@ -585,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 ) + @@ -607,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 ) + @@ -709,7 +795,7 @@ return console.askYesNo(message, true); - + jre @@ -890,6 +976,26 @@ return console.askYesNo(message, true); build_* + + + ${compiler:WRAPPER_SCRIPT_BIN_DIR} + + + + + bin + + + + + channel.props + + + + + channel.propsv + + @@ -1149,13 +1255,12 @@ return console.askYesNo(message, true); - + - @@ -1166,7 +1271,7 @@ return console.askYesNo(message, true); - + @@ -1182,17 +1287,16 @@ return console.askYesNo(message, true); - - + + - + - @@ -1203,13 +1307,12 @@ return console.askYesNo(message, true); - + - @@ -1220,13 +1323,12 @@ return console.askYesNo(message, true); - + -