climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [3/5] climate git commit: CLIMATE-548 Vagrant references should not exist in easy-ocw ubuntu script
Date Fri, 05 Dec 2014 04:59:23 GMT
CLIMATE-548 Vagrant references should not exist in easy-ocw ubuntu script


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/8617af0c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/8617af0c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/8617af0c

Branch: refs/heads/master
Commit: 8617af0c09cee2760bc2f967d4c29b1ba2476487
Parents: bf96668
Author: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Authored: Thu Nov 20 22:18:59 2014 -0800
Committer: Lewis John McGibbney <lewis.j.mcgibbney@jpl.nasa.gov>
Committed: Thu Nov 20 22:18:59 2014 -0800

----------------------------------------------------------------------
 easy-ocw/install-ubuntu.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/8617af0c/easy-ocw/install-ubuntu.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-ubuntu.sh b/easy-ocw/install-ubuntu.sh
index 3b96214..f004330 100755
--- a/easy-ocw/install-ubuntu.sh
+++ b/easy-ocw/install-ubuntu.sh
@@ -21,16 +21,17 @@ help()
 {
 cat << ENDHELP
 
-Easy OCW assists with the building of the Apache Open Climate Workbench and its dependencies
+Easy OCW assists with the building of the Apache Open Climate Workbench and 
+its dependencies.
 
 Flags:
     -h  Display this help message.
     -e  Install and configure a virtualenv environment before installation.
     -q  Quiet install. User prompts are removed (when possible).
 
-It is recommended that you pass -e when running this script. If you don't, parts
-of this installation will pollute your global Python install. If you're unsure,
-pass -e just to be safe!
+It is recommended that you pass -e when running this script. If you don't, 
+parts of this installation will pollute your global Python install. 
+If you're unsure, pass -e just to be safe!
 
 N.B. This install script has been tested against Ubuntu 12.04 and 14.04.
 Please report problems with this script to dev@climate.apache.org
@@ -104,6 +105,8 @@ VIRTUALENV_WARNING
 fi
 
 read -p "Press [ENTER] to begin installation ..."
+echo -n "Please specify a full path to where your OCW download is then press [ENTER] ..."
+read ocw_path
 fi
 
 header "Checking for pip ..."
@@ -186,6 +189,6 @@ header "Installing additional Python packages"
 pip install -r ocw-pip-dependencies.txt >> install_log
 
 # Ensure that the climate code is included in the Python Path
-header "Updating PYTHONPATH ..."
-echo "export PYTHONPATH=${HOME}/climate:${HOME}/climate/ocw" >> ${HOME}/.bashrc
+header "Updating PYTHONPATH with ocw executables ..."
+echo "export PYTHONPATH=${ocw_path}/climate:${ocw_path}/climate/ocw" >> ${HOME}/.bashrc
 subtask "done"


Mime
View raw message