Commit: 16ba5cae5bc4f206b6c1d70dd94f419ea5b1686e - build (git)

build

Commit MetaInfo

• Revision: 16ba5cae5bc4f206b6c1d70dd94f419ea5b1686e (tree)
• Zeit: 2017-04-13 17:53:37
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

envsetup.sh: support different openjdk locations

Some distributions install openjdk in a different location than Ubuntu.
Try to detect them one by one.

Tested OK on Fedora with openjdk-1.7.0.

Ändern Zusammenfassung

• modified: envsetup.sh

Diff

--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1421,7 +1421,10 @@ function set_java_home() {
               export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
               ;;
           *)
-              export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+              for j in java-1.7.0 java-7-openjdk-amd64; do
+                  [ -d /usr/lib/jvm/$j ] && break
+              done
+              export JAVA_HOME=/usr/lib/jvm/$j
               ;;
       esac