From 711c5e1ffd4af8ee38c45b71ff114319fc980c1d Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Fri, 23 Oct 2015 10:49:22 -0700 Subject: Corrected typo and update environment variables Change-Id: I46d9cdb53a88b8b69b76e91d6f0d396f8b1a19a8 Signed-off-by: Ashlee Young --- build.sh | 4 ++-- setenv.sh | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 84387a96..2a6b78aa 100755 --- a/build.sh +++ b/build.sh @@ -20,7 +20,7 @@ ##### Settings ##### VERSION=1.0.0 AUTHOR="Ashlee Young" -MODIFIED="October 18, 2015" +MODIFIED="October 23, 2015" GERRITURL="git clone ssh://im2bz2pee@gerrit.opnfv.org:29418/onosfw" ONOSURL="https://github.com/opennetworkinglab/onos" SURICATAURL="https://github.com/inliniac/suricata" @@ -171,7 +171,7 @@ installMaven() cd $GERRITROOT fi else - printf "Maven looks to be peroply installed at $M2_HOME. \n\n" + printf "Maven looks to be properly installed at $M2_HOME. \n\n" fi } ##### End Install Maven ##### diff --git a/setenv.sh b/setenv.sh index 7900ebaf..a9e37575 100755 --- a/setenv.sh +++ b/setenv.sh @@ -1,6 +1,9 @@ #!/bin/bash export GERRITROOT="$(pwd)" -export ANT_HOME=$GERRITROOT/framework/src/ant/apache-ant-1.9.6 -export M2_HOME=$GERRITROOT/framework/build/maven +export ONOSROOT=$GERRITROOT/framework/src/onos/ +export BUILDROOT=$GERRITROOT/framework/build +export JAVA_HOME=/etc/alternatives/java_sdk +export ANT_HOME=$GERRITROOT/framework/build/ant/apache-ant-1.9.6 +export M2_HOME=$GERRITROOT/framework/build/maven/build export M2=$M2_HOME/bin -export PATH=$PATH:$ANT_HOME/bin:$M2 +export PATH=$PATH:$ANT_HOME/bin:$M2:$JAVA_HOME/bin -- cgit 1.2.3-korg