Changeset 32013
- Timestamp:
- 2017-09-28T23:10:13+13:00 (7 years ago)
- Location:
- main/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/findjava.sh
r30128 r32013 77 77 # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 78 78 # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 79 HINT=`/usr/libexec/java_home` 79 80 # run silently in case no system java installed, as it will result in a confusing message about there being no java 81 # when we're still searching for java 82 macHINT=`/usr/libexec/java_home 2>&1` 83 #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 84 #/System/Library/Frameworks/JavaVM.framework/Home 85 status=$? 86 # if no java installed, then HINT will contain: 87 # Unable to find any JVMs matching version "(null)". 88 # No Java runtime present, try --request to install. 89 # and the status of running /usr/libexec/java_home will not be 0 but 1: 90 if [ "$status" = "0" ]; then 91 HINT=$macHINT 92 else 93 echo "No system Java on this mac..." 94 fi 80 95 fi 81 96 -
main/trunk/greenstone2/findjava.sh
r30128 r32013 77 77 # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 78 78 # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 79 HINT=`/usr/libexec/java_home` 79 80 # run silently in case no system java installed, as it will result in a confusing message about there being no java 81 # when we're still searching for java 82 macHINT=`/usr/libexec/java_home 2>&1` 80 83 #HINT=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home 81 84 #/System/Library/Frameworks/JavaVM.framework/Home 85 status=$? 86 # if no java installed, then HINT will contain: 87 # Unable to find any JVMs matching version "(null)". 88 # No Java runtime present, try --request to install. 89 # and the status of running /usr/libexec/java_home will not be 0 but 1: 90 if [ "$status" = "0" ]; then 91 HINT=$macHINT 92 else 93 echo "No system Java on this mac..." 94 fi 95 82 96 fi 83 97 -
main/trunk/greenstone2/setup.bash
r32012 r32013 316 316 # we can't use boolean operator -a to do the AND, since it doesn't "short-circuit" if the first test fails 317 317 # see http://www.tldp.org/LDP/abs/html/comparison-ops.html 318 319 318 320 if [ "x$GSDLOS" = "xdarwin" ] && [ ! -d "$HINT" ]; then 319 321 # http://java.dzone.com/articles/java-findingsetting … … 321 323 # regardless of which Mac OS we're on. Tested on Maverick, Lion, Leopard 322 324 # (run `/usr/libexec/java_home -v 1.7` to find a specific version) 323 HINT=`/usr/libexec/java_home` 325 macHINT=`/usr/libexec/java_home 2>&1` 326 status=$? 327 # if no java installed, then HINT will contain: 328 # Unable to find any JVMs matching version "(null)". 329 # No Java runtime present, try --request to install. 330 # and the status of running /usr/libexec/java_home will not be 0 but 1: 331 if [ "$status" = "0" ]; then 332 HINT=$macHINT 333 else 334 echo "No system Java on this mac..." 335 fi 324 336 fi 325 337 … … 331 343 echo "Set JAVA_HOME or JRE_HOME, and put it on the PATH, if working with Java tools like Lucene." 332 344 elif [[ "x$javahome" != "x" && "x$javahome" != "x$BUNDLED_JRE" ]]; then 345 echo "Using Java found at $javahome" 333 346 if [ "x$JAVA_HOME" = "x" ]; then 334 347 # if Java env vars not already set, then set them to the $javahome found
Note:
See TracChangeset
for help on using the changeset viewer.