You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2015/01/27 17:22:09 UTC
[1/4] climate git commit: CLIMATE-571 - Change Easy-OCW checks for
installed applications
Repository: climate
Updated Branches:
refs/heads/master b440baf69 -> 397da97ce
CLIMATE-571 - Change Easy-OCW checks for installed applications
- Change the structuring of the 'command' calls to check for installed
applications that are necessary for parts of the installation. This
should prevent false positives that lead to other errors later on.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/f0e23050
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/f0e23050
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/f0e23050
Branch: refs/heads/master
Commit: f0e230506c163eaaaea513ade3395d028c29058d
Parents: b440baf
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jan 22 09:20:04 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jan 22 09:20:04 2015 -0800
----------------------------------------------------------------------
easy-ocw/install-osx.sh | 8 ++++----
easy-ocw/install-ubuntu.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/f0e23050/easy-ocw/install-osx.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-osx.sh b/easy-ocw/install-osx.sh
index ca7581f..507154a 100755
--- a/easy-ocw/install-osx.sh
+++ b/easy-ocw/install-osx.sh
@@ -107,7 +107,7 @@ read -p "Press [ENTER] to begin installation ..."
fi
header "Checking for pip ..."
-if [ ! command -v pip >/dev/null 2>&1 ]; then
+command -v pip >/dev/null 2>&1 || {
task "Unable to locate pip."
task "Installing Distribute"
curl http://python-distribute.org/distribute_setup.py | python >> install_log
@@ -119,17 +119,17 @@ if [ ! command -v pip >/dev/null 2>&1 ]; then
cd pip-1.2.1/
python setup.py install >> install_log
subtask "done"
-fi
+}
if [ $WITH_VIRTUAL_ENV == 1 ]; then
header "Setting up a virtualenv ..."
# Check if virtualenv is installed. If it's not, we'll install it for the user.
- if ! command -v virtualenv >/dev/null 2>&1; then
+ command -v virtualenv >/dev/null 2>&1 || {
task "Installing virtualenv ..."
pip install virtualenv >> install_log
subtask "done"
- fi
+ }
header "Checking for previously installed ocw virtual environment..."
if [ -e ~/ocw/bin/python ]; then
http://git-wip-us.apache.org/repos/asf/climate/blob/f0e23050/easy-ocw/install-ubuntu.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-ubuntu.sh b/easy-ocw/install-ubuntu.sh
index 637f0e8..1783cc8 100755
--- a/easy-ocw/install-ubuntu.sh
+++ b/easy-ocw/install-ubuntu.sh
@@ -110,22 +110,22 @@ read ocw_path
fi
header "Checking for pip ..."
-if [ ! command -v pip >/dev/null 2>&1 ]; then
+command -v pip >/dev/null 2>&1 || {
task "Unable to locate pip."
task "Installing Pip"
sudo apt-get install python-pip >> install_log
subtask "done"
-fi
+}
if [ $WITH_VIRTUAL_ENV == 1 ]; then
header "Setting up a virtualenv ..."
# Check if virtualenv is installed. If it's not, we'll install it for the user.
- if ! command -v virtualenv >/dev/null 2>&1; then
+ command -v virtualenv >/dev/null 2>&1 || {
task "Installing virtualenv ..."
sudo apt-get install -y python-virtualenv >> install_log
subtask "done"
- fi
+ }
# Create a new environment for OCW work
task "Creating a new environment ..."
[2/4] climate git commit: CLIMATE-566 - Fix output redirect log
clobbering bugs
Posted by jo...@apache.org.
CLIMATE-566 - Fix output redirect log clobbering bugs
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c8f78a6c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c8f78a6c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c8f78a6c
Branch: refs/heads/master
Commit: c8f78a6cd696c90af11446733d178a109fc21e7b
Parents: b440baf
Author: Michael Joyce <jo...@apache.org>
Authored: Thu Jan 22 10:20:05 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Thu Jan 22 10:20:05 2015 -0800
----------------------------------------------------------------------
easy-ocw/install-ubuntu.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/c8f78a6c/easy-ocw/install-ubuntu.sh
----------------------------------------------------------------------
diff --git a/easy-ocw/install-ubuntu.sh b/easy-ocw/install-ubuntu.sh
index 637f0e8..c34641f 100755
--- a/easy-ocw/install-ubuntu.sh
+++ b/easy-ocw/install-ubuntu.sh
@@ -145,7 +145,7 @@ read -p "Press [ENTER] to continue ..."
cd
task "Downloading Anaconda ..."
-wget -O Anaconda-1.9.2-Linux-x86_64.sh "http://repo.continuum.io/archive/Anaconda-1.9.2-Linux-x86_64.sh" 2> install_log
+wget -O Anaconda-1.9.2-Linux-x86_64.sh "http://repo.continuum.io/archive/Anaconda-1.9.2-Linux-x86_64.sh" 2>> install_log
subtask "done"
task "Installing ..."
@@ -161,7 +161,7 @@ header "Handling Basemap install ..."
cd
task "Downloading basemap ..."
-wget -O basemap-1.0.7.tar.gz "http://sourceforge.net/projects/matplotlib/files/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz/download" 2> install_log
+wget -O basemap-1.0.7.tar.gz "http://sourceforge.net/projects/matplotlib/files/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz/download" 2>> install_log
tar xzf basemap-1.0.7.tar.gz >> install_log
subtask "done"
[4/4] climate git commit: Resolve CLIMATE-566. Merge PR #147.
Posted by jo...@apache.org.
Resolve CLIMATE-566. Merge PR #147.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/397da97c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/397da97c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/397da97c
Branch: refs/heads/master
Commit: 397da97ce2c87e7a27093403e9bf38ac6d003e0e
Parents: 9e3612d c8f78a6
Author: Michael Joyce <jo...@apache.org>
Authored: Tue Jan 27 08:21:40 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Tue Jan 27 08:21:40 2015 -0800
----------------------------------------------------------------------
easy-ocw/install-ubuntu.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/397da97c/easy-ocw/install-ubuntu.sh
----------------------------------------------------------------------
[3/4] climate git commit: Resolve CLIMATE-571. Merge PR #146.
Posted by jo...@apache.org.
Resolve CLIMATE-571. Merge PR #146.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9e3612d1
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9e3612d1
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9e3612d1
Branch: refs/heads/master
Commit: 9e3612d145e0d9715417f61612be72366f59cab4
Parents: b440baf f0e2305
Author: Michael Joyce <jo...@apache.org>
Authored: Tue Jan 27 08:20:37 2015 -0800
Committer: Michael Joyce <jo...@apache.org>
Committed: Tue Jan 27 08:20:37 2015 -0800
----------------------------------------------------------------------
easy-ocw/install-osx.sh | 8 ++++----
easy-ocw/install-ubuntu.sh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------