Showing
1 changed file
with
7 additions
and
2 deletions
| ... | @@ -16,7 +16,9 @@ endif | ... | @@ -16,7 +16,9 @@ endif |
| 16 | # Setup some environmental context for developers | 16 | # Setup some environmental context for developers |
| 17 | if ( ! $?JAVA_HOME ) then | 17 | if ( ! $?JAVA_HOME ) then |
| 18 | if ( -x /usr/libexec/java_home ) then | 18 | if ( -x /usr/libexec/java_home ) then |
| 19 | - setenv JAVA_HOME `/usr/libexec/java_home -v 1.7` | 19 | + setenv JAVA_HOME `/usr/libexec/java_home -v 1.8` |
| 20 | + else if ( -d /usr/lib/jvm/java-8-oracle ) then | ||
| 21 | + setenv JAVA_HOME /usr/lib/jvm/java-8-oracle | ||
| 20 | else if ( -d /usr/lib/jvm/java-7-openjdk-amd64 ) then | 22 | else if ( -d /usr/lib/jvm/java-7-openjdk-amd64 ) then |
| 21 | setenv JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 | 23 | setenv JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 |
| 22 | endif | 24 | endif |
| ... | @@ -24,8 +26,11 @@ endif | ... | @@ -24,8 +26,11 @@ endif |
| 24 | if ( ! $?MAVEN ) then | 26 | if ( ! $?MAVEN ) then |
| 25 | setenv MAVEN $HOME/Applications/apache-maven-3.2.2 | 27 | setenv MAVEN $HOME/Applications/apache-maven-3.2.2 |
| 26 | endif | 28 | endif |
| 29 | +if ( ! $?KARAF_VERSION ) then | ||
| 30 | + setenv KARAF_VERSION 3.0.2 | ||
| 31 | +endif | ||
| 27 | if ( ! $?KARAF ) then | 32 | if ( ! $?KARAF ) then |
| 28 | - setenv KARAF $HOME/Applications/apache-karaf-3.0.1 | 33 | + setenv KARAF $HOME/Applications/apache-karaf-$KARAF_VERSION |
| 29 | endif | 34 | endif |
| 30 | setenv KARAF_LOG $KARAF/data/log/karaf.log | 35 | setenv KARAF_LOG $KARAF/data/log/karaf.log |
| 31 | 36 | ... | ... |
-
Please register or login to post a comment