mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add checks based on osname AND osversion instead of only latter inside deb dependency installation

Browse Source
This commit is contained in:
ronivay
2021-05-03 15:02:35 +03:00
parent 15cc82ff8a
commit 3b517d79d9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xo-install.sh
View File

@@ -206,7 +206,7 @@ function InstallDependenciesDeb {
# Install necessary dependencies for XO build # Install necessary dependencies for XO build
if [[ $OSVERSION =~ (16|18|20) ]]; then if [[ $OSNAME == "Ubuntu" ]]; then
echo echo
printprog "OS Ubuntu so making sure universe repository is enabled" printprog "OS Ubuntu so making sure universe repository is enabled"
cmdlog "add-apt-repository universe" cmdlog "add-apt-repository universe"
@@ -221,7 +221,7 @@ function InstallDependenciesDeb {
printok "Running apt-get update" printok "Running apt-get update"
#determine which python package is needed. Ubuntu 20 requires python2-minimal, 16 and 18 are python-minimal #determine which python package is needed. Ubuntu 20 requires python2-minimal, 16 and 18 are python-minimal
if [[ $OSVERSION == "20" ]]; then if [[ $OSNAME == "Ubuntu" ]] && [[ $OSVERSION == "20" ]]; then
PYTHON="python2-minimal" PYTHON="python2-minimal"
else else
PYTHON="python-minimal" PYTHON="python-minimal"
@@ -241,7 +241,7 @@ function InstallDependenciesDeb {
apt-get install -y apt-transport-https ca-certificates >>$LOGFILE 2>&1 apt-get install -y apt-transport-https ca-certificates >>$LOGFILE 2>&1
printok "Installing apt-transport-https and ca-certificates packages to support https repos" printok "Installing apt-transport-https and ca-certificates packages to support https repos"
if [[ $OSVERSION == "10" ]]; then if [[ $OSNAME == "Debian" ]] && [[ $OSVERSION == "10" ]]; then
echo echo
printprog "Debian 10, so installing gnupg also" printprog "Debian 10, so installing gnupg also"
cmdlog "apt-get install gnupg -y" cmdlog "apt-get install gnupg -y"