Merge lp:~cpe-sa/obinstall/fix-eula into lp:obinstall/next

[Matt Jarvis]

Fix EULA popup, add code to force sudo since we're installing packages, add some error handling, fix launching of application

Unmerged revisions

20. By Matt Jarvis <email address hidden> on 2017-01-11

Fix EULA, re-factor and fix launching of winbox application

=== modified file 'network/winbox.sh'
--- network/winbox.sh	2016-06-15 13:49:54 +0000
+++ network/winbox.sh	2017-01-11 17:33:47 +0000
@@ -21,11 +21,28 @@
 
 # set -x 
 
-if ! dpkg -l | grep -q 'wine ' ; then sudo apt-get install -qy wine; fi
-
-wget -qc http://download2.mikrotik.com/routeros/winbox/3.4/winbox.exe -O ~/winbox.exe
-
-echo Running winbox under wine, all log messages written to /tmp/wine-winbox.log
-
-cd /tmp && wine ~/winbox.exe &> /tmp/wine-winbox.log
+# If user is not root then exit
+#
+if [ "$(id -u)" != "0" ]; then
+    echo "Must be run with sudo or by root"
+    exit 77
+fi
+
+# Fix EULA popup for MS Fonts
+echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | sudo debconf-set-selections
+
+if ! dpkg -l | grep -q 'wine ';then
+    if ! apt-get install -qy wine; then
+        echo "Could not install wine"
+        exit 1
+    fi
+fi
+
+if ! wget -qc http://download2.mikrotik.com/routeros/winbox/3.4/winbox.exe -O ~/winbox.exe;then
+    echo "Could not download winbox.exe"
+    exit 1
+fi
+
+echo "Running winbox under wine, all log messages written to /tmp/wine-winbox.log"
+cd /tmp && su - ubuntu -c "wine /home/ubuntu/winbox.exe &> /tmp/wine-winbox.log"