Changeset 30128 for main/trunk/greenstone2/findjava.sh
- Timestamp:
- 2015-08-24T17:21:50+12:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/findjava.sh
r29010 r30128 67 67 68 68 # Give search4j a hint to find Java depending on the platform 69 if [ $GSDLOS = linux ]; then 70 HINT=`cd "$GSDLHOME";pwd`/packages/jre 71 elif [ $GSDLOS = darwin ]; then 72 # http://java.dzone.com/articles/java-findingsetting 73 # explains that /usr/libexec/java_home will print out the default JDK 69 # we now include a JRE with Mac (Mountain) Lion, because from Yosemite onwards there's no system Java on Macs 70 HINT=`cd "$GSDLHOME";pwd`/packages/jre 71 72 # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails 73 # see http://www.tldp.org/LDP/abs/html/comparison-ops.html 74 if [ "$GSDLOS" = "darwin" ] && [ ! -d "$HINT" ]; then 75 # http://java.dzone.com/articles/java-findingsetting 76 # explains that /usr/libexec/java_home will print the default JDK 74 77 # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 75 78 # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 76 79 HINT=`/usr/libexec/java_home` 77 78 80 #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 79 81 #/System/Library/Frameworks/JavaVM.framework/Home 80 fi 82 fi 81 83 82 84 javapath="`"$SEARCH4J_EXECUTABLE" -e -p "$HINT" -m $MINIMUM_JAVA_VERSION`"
Note:
See TracChangeset
for help on using the changeset viewer.