Resolve CLIMATE-458. Merge PR #61.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ac2ad6d0 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ac2ad6d0 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ac2ad6d0 Branch: refs/heads/master Commit: ac2ad6d05420b67c930c4810312bd001a4373502 Parents: 0f6fad6 2afe2cd Author: Michael Joyce <[email protected]> Authored: Wed Jun 4 14:24:59 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Wed Jun 4 14:24:59 2014 -0700 ---------------------------------------------------------------------- ocw-vm/init-ocw-vm.sh | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/ac2ad6d0/ocw-vm/init-ocw-vm.sh ---------------------------------------------------------------------- diff --cc ocw-vm/init-ocw-vm.sh index a58964c,ad7cdd1..5dec5fb --- a/ocw-vm/init-ocw-vm.sh +++ b/ocw-vm/init-ocw-vm.sh @@@ -44,10 -39,11 +44,16 @@@ sudo apt-get install -y eo # Use the Easy-OCW Ubuntu install script to get everything # else installed! git clone http://git-wip-us.apache.org/repos/asf/climate.git + +# Copy the Easy-OCW install script for Ubuntu cp climate/easy-ocw/install-ubuntu-12_04.sh . +# Copy the requirements files for conda and pip used by Easy-OCW +cp climate/easy-ocw/*.txt . + bash install-ubuntu-12_04.sh -q + + # Set symlink for the UI frontend code + cd climate/ocw-ui/backend + ln -s ../frontend/app app + + cd
