From 703ec751906271e135954ef0dc70e2c645461edc Mon Sep 17 00:00:00 2001 From: bnrstnr Date: Thu, 2 Aug 2018 08:51:30 -0400 Subject: [PATCH 1/5] Update xo_install.sh --- xo_install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xo_install.sh b/xo_install.sh index 1b56ba0..42b7667 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -7,6 +7,9 @@ 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) +if [ "distro" = "Ubuntu" ]; then /usr/bin/add-apt-repository multiverse; fi + xo_branch="master" xo_server="https://github.com/vatesfr/xen-orchestra" n_repo="https://raw.githubusercontent.com/visionmedia/n/master/bin/n" From d4506d711fe29b3b51ba5e102f7dbce3ace69af9 Mon Sep 17 00:00:00 2001 From: bnrstnr Date: Thu, 2 Aug 2018 08:52:53 -0400 Subject: [PATCH 2/5] Update xo_install.sh --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 42b7667..4047cbb 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -8,7 +8,7 @@ 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) -if [ "distro" = "Ubuntu" ]; then /usr/bin/add-apt-repository multiverse; fi +if [ "$distro" = "Ubuntu" ]; then /usr/bin/add-apt-repository multiverse; fi xo_branch="master" xo_server="https://github.com/vatesfr/xen-orchestra" From b7b25271766eefe2fc991b6921351369289e94a2 Mon Sep 17 00:00:00 2001 From: bnrstnr Date: Thu, 2 Aug 2018 11:06:14 -0400 Subject: [PATCH 3/5] Update xo_install.sh --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 4047cbb..7f4757a 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -40,7 +40,7 @@ echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list /usr/local/bin/n lts #Install XO dependencies -/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common +/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common || echo "Aborting due to failure to install dependencies. Please see troubleshooting guide." && exit /usr/bin/git clone -b $xo_branch $xo_server From 303fabf3b811f239e9417447cb6453d05bb8e2b9 Mon Sep 17 00:00:00 2001 From: bnrstnr Date: Thu, 2 Aug 2018 15:42:34 -0400 Subject: [PATCH 4/5] Update xo_install.sh --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 7f4757a..682606f 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -40,7 +40,7 @@ echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list /usr/local/bin/n lts #Install XO dependencies -/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common || echo "Aborting due to failure to install dependencies. Please see troubleshooting guide." && exit +/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common || echo "Aborting due to failure to install dependencies. Please see troubleshooting guide." && exit; /usr/bin/git clone -b $xo_branch $xo_server From 3553c1aa9eb82bffaefab242424acdf7871c358e Mon Sep 17 00:00:00 2001 From: bnrstnr Date: Thu, 2 Aug 2018 15:56:48 -0400 Subject: [PATCH 5/5] Update xo_install.sh --- xo_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xo_install.sh b/xo_install.sh index 682606f..4047cbb 100644 --- a/xo_install.sh +++ b/xo_install.sh @@ -40,7 +40,7 @@ echo "$yarn_repo" | tee /etc/apt/sources.list.d/yarn.list /usr/local/bin/n lts #Install XO dependencies -/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common || echo "Aborting due to failure to install dependencies. Please see troubleshooting guide." && exit; +/usr/bin/apt-get install --yes build-essential redis-server libpng-dev git python-minimal libvhdi-utils nfs-common /usr/bin/git clone -b $xo_branch $xo_server