From 705bf601452ea398244b5e40eec841c8fce5343d Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Fri, 13 May 2011 18:22:14 +0200
Subject: [PATCH] feature #564: Add install_novnc script

---
 install.sh             |  3 +++
 share/install_novnc.sh | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100755 share/install_novnc.sh

diff --git a/install.sh b/install.sh
index 086fd0e155..a9d0322224 100755
--- a/install.sh
+++ b/install.sh
@@ -292,6 +292,7 @@ INSTALL_FILES=(
     IMAGE_DRIVER_FS_SCRIPTS:$LIB_LOCATION/remotes/image/fs
     IMAGE_DRIVER_FS_SCRIPTS:$VAR_LOCATION/remotes/image/fs
     EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples
+    INSTALL_NOVNC_SHARE_FILE:$SHARE_LOCATION
     TM_EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples/tm
     HOOK_SHARE_FILES:$SHARE_LOCATION/hooks
     COMMON_CLOUD_LIB_FILES:$LIB_LOCATION/ruby/cloud
@@ -644,6 +645,8 @@ HOOK_SHARE_FILES="share/hooks/ebtables-xen \
                   share/hooks/host_error.rb \
                   share/hooks/image.rb"
 
+INSTALL_NOVNC_SHARE_FILE="share/install_novnc.sh"
+
 #-------------------------------------------------------------------------------
 # Common Cloud Files
 #-------------------------------------------------------------------------------
diff --git a/share/install_novnc.sh b/share/install_novnc.sh
new file mode 100755
index 0000000000..8957d226cb
--- /dev/null
+++ b/share/install_novnc.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+NOVNC_TMP=/tmp/one/novnc-$(date "+%Y%m%d%H%M%S")
+
+if [ -z "$ONE_LOCATION" ]; then
+    ONE_SHARE=/usr/share/one
+    ONE_PUBLIC_SUNSTONE=/usr/lib/one/sunstone/public
+    SUNSTONE_CONF=/etc/one/sunstone-server.conf
+else
+    ONE_SHARE=$ONE_LOCATION/share
+    ONE_PUBLIC_SUNSTONE=$ONE_LOCATION/lib/sunstone/public
+    SUNSTONE_CONF=$ONE_LOCATION/etc/sunstone-server.conf
+fi
+
+mkdir -p $NOVNC_TMP
+wget -P $NOVNC_TMP --no-check-certificate http://github.com/kanaka/noVNC/tarball/master
+
+if [ $? -ne 0 ]; then
+  echo "Error downloading noVNC"
+  exit 1
+fi
+
+tar=`ls -rt $NOVNC_TMP|tail -n1`
+tar -C $ONE_SHARE -mxvzf $NOVNC_TMP/$tar
+
+if [ $? -ne 0 ]; then
+  echo "Error untaring noVNC"
+  exit 1
+fi
+
+dir=`ls -rt $ONE_SHARE|tail -n1`
+mv $ONE_SHARE/$dir $ONE_SHARE/noVNC
+
+mkdir -p $ONE_PUBLIC_SUNSTONE/vendor/noVNC
+mv $ONE_SHARE/noVNC/include/ $ONE_PUBLIC_SUNSTONE/vendor/noVNC/
+
+sed -i "s%^\(NOVNC_PATH=\)%\1$ONE_SHARE/noVNC%" $SUNSTONE_CONF