Update to the tools scripts:
* Update to envDefaults: if environmental varialbe ONOS_CELL is set,
the load it, so its variables can be used by other scripts
* Modifications inside tools/dev/bash_profile:
- Update the setting of JAVA_HOME so it works for Ubuntu with
OpenJDK-1.7
- Removed "." from being added to the PATH, because it is a security hole
Showing
2 changed files
with
10 additions
and
2 deletions
| ... | @@ -25,6 +25,9 @@ export ONOS_STAGE=$ONOS_STAGE_ROOT/$ONOS_BITS | ... | @@ -25,6 +25,9 @@ export ONOS_STAGE=$ONOS_STAGE_ROOT/$ONOS_BITS |
| 25 | export ONOS_TAR=$ONOS_STAGE.tar.gz | 25 | export ONOS_TAR=$ONOS_STAGE.tar.gz |
| 26 | 26 | ||
| 27 | # Defaults for ONOS testing using remote machines. | 27 | # Defaults for ONOS testing using remote machines. |
| 28 | +if [ -n "${ONOS_CELL}" -a -f $ONOS_ROOT/tools/test/cells/${ONOS_CELL} ]; then | ||
| 29 | + . $ONOS_ROOT/tools/test/cells/${ONOS_CELL} | ||
| 30 | +fi | ||
| 28 | export ONOS_INSTALL_DIR="/opt/onos" # Installation directory on remote | 31 | export ONOS_INSTALL_DIR="/opt/onos" # Installation directory on remote |
| 29 | export OCI="${OCI:-192.168.56.101}" # ONOS Controller Instance | 32 | export OCI="${OCI:-192.168.56.101}" # ONOS Controller Instance |
| 30 | export ONOS_USER="sdn" # ONOS user on remote system | 33 | export ONOS_USER="sdn" # ONOS user on remote system | ... | ... |
| ... | @@ -6,7 +6,13 @@ | ... | @@ -6,7 +6,13 @@ |
| 6 | export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} | 6 | export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} |
| 7 | 7 | ||
| 8 | # Setup some environmental context for developers | 8 | # Setup some environmental context for developers |
| 9 | -export JAVA_HOME=${JAVA_HOME:-$(/usr/libexec/java_home -v 1.7)} | 9 | +if [ -z "${JAVA_HOME}" ]; then |
| 10 | + if [ -x /usr/libexec/java_home ]; then | ||
| 11 | + export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) | ||
| 12 | + elif [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then | ||
| 13 | + export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" | ||
| 14 | + fi | ||
| 15 | +fi | ||
| 10 | export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2} | 16 | export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2} |
| 11 | export KARAF=${KARAF:-~/Applications/apache-karaf-3.0.1} | 17 | export KARAF=${KARAF:-~/Applications/apache-karaf-3.0.1} |
| 12 | export KARAF_LOG=$KARAF/data/log/karaf.log | 18 | export KARAF_LOG=$KARAF/data/log/karaf.log |
| ... | @@ -15,7 +21,6 @@ export KARAF_LOG=$KARAF/data/log/karaf.log | ... | @@ -15,7 +21,6 @@ export KARAF_LOG=$KARAF/data/log/karaf.log |
| 15 | export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin" | 21 | export PATH="$PATH:$ONOS_ROOT/tools/dev/bin:$ONOS_ROOT/tools/test/bin" |
| 16 | export PATH="$PATH:$ONOS_ROOT/tools/build" | 22 | export PATH="$PATH:$ONOS_ROOT/tools/build" |
| 17 | export PATH="$PATH:$MAVEN/bin:$KARAF/bin" | 23 | export PATH="$PATH:$MAVEN/bin:$KARAF/bin" |
| 18 | -export PATH="$PATH:." | ||
| 19 | 24 | ||
| 20 | # Convenience utility to warp to various ONOS source projects | 25 | # Convenience utility to warp to various ONOS source projects |
| 21 | # e.g. 'o api', 'o dev', 'o' | 26 | # e.g. 'o api', 'o dev', 'o' | ... | ... |
-
Please register or login to post a comment