[1/2] git commit: CLIMATE-468 - Add helpful links to VM build desktop

[jo...@apache.org]

Repository: climate
Updated Branches:
  refs/heads/master b7ed8f5da -> 8b84418fb


CLIMATE-468 - Add helpful links to VM build desktop

- Add desktop shortcut to the checkout OCW code base.
- Add desktop shortcut for starting up the UI backend. Once this has
  been started you can use the UI by opening Firefox and pointing the
  browser to the URL displayed in the terminal.
- Set the default desktop environment to Unity. The shortcuts rely on
  being able to boot up a file browser. For simplicity Nautilus was
  chosen. XFCE is great for testing, but it's not the most user friendly
  and it's rather out of date looking. For the likely users of the VM it
  makes sense to have the default desktop environment be a bit nicer
  looking.


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

Branch: refs/heads/master
Commit: 67fbadd128468ec986d4bc6a421a1c898df97a71
Parents: 86131eb
Author: Michael Joyce <jo...@apache.org>
Authored: Sat Jun 7 17:22:41 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Sat Jun 7 17:22:41 2014 -0700

----------------------------------------------------------------------
 ocw-vm/init-ocw-vm.sh | 48 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/67fbadd1/ocw-vm/init-ocw-vm.sh
----------------------------------------------------------------------
diff --git a/ocw-vm/init-ocw-vm.sh b/ocw-vm/init-ocw-vm.sh
index 8ff859b..658a494 100755
--- a/ocw-vm/init-ocw-vm.sh
+++ b/ocw-vm/init-ocw-vm.sh
@@ -34,12 +34,12 @@ sudo apt-get install -y vim
 sudo apt-get install -y lightdm
 
 # XFCE
-sudo apt-get install -y xfce4
-sudo apt-get install -y xdg-utils
-sudo apt-get install -y eog
+#sudo apt-get install -y xfce4
+#sudo apt-get install -y xdg-utils
+#sudo apt-get install -y eog
 
 # Ubuntu Unity
-#sudo apt-get install -y ubuntu-desktop
+sudo apt-get install -y ubuntu-desktop
 
 # Use the Easy-OCW Ubuntu install script to get everything
 # else installed!
@@ -61,3 +61,43 @@ 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
+
+mkdir /home/vagrant/Desktop
+
+# These links will only work if we're using the Unity desktop.
+# If you want to use the XFCE desktop you will need to change
+# the references to 'nautilus' to whatever file browser you
+# will be using.
+cat >/home/vagrant/Desktop/climate.desktop <<CODELINK
+[Desktop Entry]
+Name=Climate-Code
+Icon=utilities-terminal
+Exec=nautilus /home/vagrant/climate
+Terminal=false
+Type=Application
+CODELINK
+
+cat >/home/vagrant/Desktop/ui.desktop <<UISTART
+[Desktop Entry]
+Name=Climate-UI
+Icon=utilities-terminal
+Exec=/home/vagrant/Desktop/.ui.sh
+Terminal=true
+Type=Application
+UISTART
+
+cat >/home/vagrant/Desktop/.ui.sh <<UIBOOTUP
+#!/bin/bash
+export PATH=/home/vagrant/anaconda/bin:$PATH
+export PYTHONPATH=/home/vagrant/climate:/home/vagrant/climate/ocw
+cd ~/climate/ocw-ui/backend && python run_webservices.py
+UIBOOTUP
+
+# It is possible that these commands will need to be rerun once
+# the desktop environment has been updated. You will notice that
+# they aren't recognized as shortcuts if you need to rerun these
+# commands. If all is working properly, you should see terminal
+# icons with the names listed above (Climate-Code or Climate-UI).
+chmod +x ~/Desktop/climate.desktop
+chmod +x ~/Desktop/.ui.sh
+chmod +x ~/Desktop/ui.desktop

[2/2] git commit: Resolve CLIMATE-468. Merge PR #68.

[jo...@apache.org]

Resolve CLIMATE-468. Merge PR #68.


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

Branch: refs/heads/master
Commit: 8b84418fb4deccbe68880807e82de0c5303d9ad5
Parents: b7ed8f5 67fbadd
Author: Michael Joyce <jo...@apache.org>
Authored: Tue Jun 10 11:14:33 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Tue Jun 10 11:14:33 2014 -0700

----------------------------------------------------------------------
 ocw-vm/init-ocw-vm.sh | 48 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------