From 6b1b0c41ec9d8815d04ca948edb65b6656939052 Mon Sep 17 00:00:00 2001 From: Michael Joyce Date: Wed, 4 Jun 2014 19:55:51 -0700 Subject: [PATCH] CLIMATE-462 - Move Ubuntu Easy OCW clean to VM init script --- easy-ocw/install-ubuntu-12_04.sh | 8 -------- ocw-vm/init-ocw-vm.sh | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/easy-ocw/install-ubuntu-12_04.sh b/easy-ocw/install-ubuntu-12_04.sh index adb3fbb0..2270eb0a 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 diff --git a/ocw-vm/init-ocw-vm.sh b/ocw-vm/init-ocw-vm.sh index 5dec5fbb..8ff859b0 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