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

Merge pull request #162 from ronivay/fix/use-python3-everywhere

Browse Source 
feat: use python3 for all OS's
This commit is contained in:
Roni Väyrynen
2023-01-13 20:02:41 +02:00
committed by GitHub
parent a28281cba0 aeb656a8ef
commit e6a0e70ef2
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -138,8 +138,7 @@ deb:
- redis-server - redis-server
- libpng-dev - libpng-dev
- git - git
- python-minimal - python3-minimal
- python2-minimal (Ubuntu 20/22 or Debian 11 only, replaces python-minimal)
- libvhdi-utils - libvhdi-utils
- lvm2 - lvm2
- nfs-common - nfs-common

17
xo-install.sh
View File

@@ -204,9 +204,9 @@ function InstallDependenciesRPM {
# install packages # install packages
echo echo
printprog "Installing build dependencies, redis server, python, git, nfs-utils, cifs-utils, lvm2, ntfs-3g, libxml2" printprog "Installing build dependencies, redis server, python3, git, nfs-utils, cifs-utils, lvm2, ntfs-3g, libxml2"
runcmd "yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel python3 git nfs-utils cifs-utils lvm2 ntfs-3g libxml2" runcmd "yum -y install gcc gcc-c++ make openssl-devel redis libpng-devel python3 git nfs-utils cifs-utils lvm2 ntfs-3g libxml2"
printok "Installing build dependencies, redis server, python, git, nfs-utils, cifs-utils, lvm2, ntfs-3g, libxml2" printok "Installing build dependencies, redis server, python3, git, nfs-utils, cifs-utils, lvm2, ntfs-3g, libxml2"
# only run automated node install if executable not found # only run automated node install if executable not found
if [[ -z $(runcmd_stdout "command -v node") ]]; then if [[ -z $(runcmd_stdout "command -v node") ]]; then
@@ -286,18 +286,11 @@ function InstallDependenciesDeb {
runcmd "apt-get update" runcmd "apt-get update"
printok "Running apt-get update" printok "Running apt-get update"
#determine which python package is needed. Ubuntu 20/Debian 11 require python2-minimal, others have python-minimal
if [[ "$OSNAME" =~ ^(Ubuntu|Debian)$ ]] && [[ "$OSVERSION" =~ ^(20|22|11)$ ]]; then
local PYTHON="python2-minimal"
else
local PYTHON="python-minimal"
fi
# install packages # install packages
echo echo
printprog "Installing build dependencies, redis server, python, git, libvhdi-utils, lvm2, nfs-common, cifs-utils, curl, ntfs-3g, libxml2-utils" printprog "Installing build dependencies, redis server, python3-minimal, git, libvhdi-utils, lvm2, nfs-common, cifs-utils, curl, ntfs-3g, libxml2-utils"
runcmd "apt-get install -y build-essential redis-server libpng-dev git libvhdi-utils $PYTHON lvm2 nfs-common cifs-utils curl ntfs-3g libxml2-utils" runcmd "apt-get install -y build-essential redis-server libpng-dev git libvhdi-utils python3-minimal lvm2 nfs-common cifs-utils curl ntfs-3g libxml2-utils"
printok "Installing build dependencies, redis server, python, git, libvhdi-utils, lvm2, nfs-common, cifs-utils, curl, ntfs-3g, libxml2-utils" printok "Installing build dependencies, redis server, python3-minimal, git, libvhdi-utils, lvm2, nfs-common, cifs-utils, curl, ntfs-3g, libxml2-utils"
# Install apt-transport-https and ca-certificates because of yarn https repo url # Install apt-transport-https and ca-certificates because of yarn https repo url
echo echo