Update xo_install.sh

Cleanup and organization of code a bit.

Troubleshooting.md

@@ -32,18 +32,3 @@ This will check and continually update the last 50 log files for your XOCE insta
 
        journalctl -u xo-server -f -n 50
 
-# Required Dependencies 
-
-Your system must be able to install the following list of dependencies, usually this is automatic but some distributions might not have the required repositories. Plese confirm you can install these before creating a ticket. 
-
-Check your distribution respositories list ie: ```/etc/apt/sources.list``` for multiverse. 
-
-* build-essential 
-* redis-server 
-* libpng-dev 
-* git 
-* python-minimal 
-* libvhdi-utils 
-* nfs-common
-
-These dependencies (on Ubuntu) are available from the ```multiverse``` and ```universe``` repositories. 

xo_install.sh

@@ -7,8 +7,11 @@
 totalk=$(awk '/^MemTotal:/{print $2}' /proc/meminfo)
 if [ "$totalk" -lt "1000000" ]; then echo "XOCE Requires at least 1GB Memory!"; exit 1; fi 
 
-distro=$(/usr/bin/lsb_release -is)
+# Repository add - confirm required repoistor(ies) are enabled and active, update and upgrade no matter what
-if [ "$distro" = "Ubuntu" ]; then /usr/bin/add-apt-repository multiverse; fi
+multiverse="http://archive.ubuntu.com/multiverse"
+if ! grep -q "^deb .*$multiverse"  /etc/apt/sources.list;
+then
+sudo add-apt-repository multiverse
 
 xo_branch="master"
 xo_server="https://github.com/vatesfr/xen-orchestra"
@@ -39,12 +42,6 @@ echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list
 /bin/chmod +x $n_location
 /usr/local/bin/n lts
 
-#Symbolic Link
-ln -s /usr/bin/node /usr/local/bin/node
-
-#node_modules directory creation
-mkdir /usr/local/lib/node_modules/
-
 #Install XO dependencies
 /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common
 
@@ -93,4 +90,4 @@ fi
 echo ""
 echo ""
 echo "Installation complete, open a browser to:" && hostname -I && echo "" && echo "Default Login:"admin@admin.net" Password:"admin"" && echo "" && echo "Don't forget to change your password!"
-
+fi