Repository: climate Updated Branches: refs/heads/master fbe457400 -> 9079213d7
CLIMATE-462 - Move Ubuntu Easy OCW clean to VM init script Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/6b1b0c41 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/6b1b0c41 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/6b1b0c41 Branch: refs/heads/master Commit: 6b1b0c41ec9d8815d04ca948edb65b6656939052 Parents: fbe4574 Author: Michael Joyce <[email protected]> Authored: Wed Jun 4 19:55:51 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Wed Jun 4 19:55:51 2014 -0700 ---------------------------------------------------------------------- easy-ocw/install-ubuntu-12_04.sh | 8 -------- ocw-vm/init-ocw-vm.sh | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/6b1b0c41/easy-ocw/install-ubuntu-12_04.sh ---------------------------------------------------------------------- diff --git a/easy-ocw/install-ubuntu-12_04.sh b/easy-ocw/install-ubuntu-12_04.sh index adb3fbb..2270eb0 100755 --- a/easy-ocw/install-ubuntu-12_04.sh +++ b/easy-ocw/install-ubuntu-12_04.sh @@ -148,10 +148,6 @@ bash Anaconda-1.9.2-Linux-x86_64.sh export PATH="/home/vagrant/anaconda/bin:$PATH" subtask "done" -task "Cleaning up Anaconda download ..." -rm -f Anaconda-1.9.2-Linux-x86_64.sh -subtask "done" - # Install Basemap. Conda cannot be used for this install since # it fails to analyse the dependencies (at the time of writing). This # will install it manually. At some point, this should be replaced with @@ -179,11 +175,7 @@ cd .. python setup.py install >> install_log subtask "done" -task "Cleaning up Basemap install ..." cd -rm -f basemap-1.0.7.tar.gz -rm -rf basemap-1.0.7 -subtask "done" # Install miscellaneous Python packages needed for OCW. Some of these # can be installed with Conda, but since none of them have an annoying http://git-wip-us.apache.org/repos/asf/climate/blob/6b1b0c41/ocw-vm/init-ocw-vm.sh ---------------------------------------------------------------------- diff --git a/ocw-vm/init-ocw-vm.sh b/ocw-vm/init-ocw-vm.sh index 5dec5fb..8ff859b 100755 --- a/ocw-vm/init-ocw-vm.sh +++ b/ocw-vm/init-ocw-vm.sh @@ -56,4 +56,8 @@ bash install-ubuntu-12_04.sh -q cd climate/ocw-ui/backend ln -s ../frontend/app app +# Cleanup Anaconda and Basemap downloads from the install script cd +sudo rm -f Anaconda-1.9.2-Linux-x86_64.sh +sudo rm -f basemap-1.0.7.tar.gz +sudo rm -rf basemap-1.0.7
