Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d59c59a authored by Dark Eyes's avatar Dark Eyes Committed by Gerrit Code Review
Browse files

envsetup: Always look up JAVA_HOME path 

Change-Id: I8b0641eb107cd095079bb17f92e99730f532fda7
parent 3c8f614a

envsetup.sh

+2 −2
Original line number Original line Diff line number Diff line
@@ -2486,7 +2486,7 @@ function set_java_home() { 
                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)

                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)

                ;;

                ;;

            *)

            *)

                export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64

                export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))

                ;;

                ;;

        esac

        esac

      else

      else
@@ -2495,7 +2495,7 @@ function set_java_home() { 
                export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)

                export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)

                ;;

                ;;

            *)

            *)

                export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

                export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))

                ;;

                ;;

        esac

        esac

      fi

      fi