Skip to content

Commit d8df8ef

Browse files
oharboenekronos
authored andcommitted
depedencyinstaller: Ubuntu 22.10 support
Signed-off-by: Øyvind Harboe <[email protected]>
1 parent d1adbf7 commit d8df8ef

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

etc/DependencyInstaller.sh

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ _installOrTools() {
128128
arch=$3
129129
orToolsVersionBig=9.5
130130
orToolsVersionSmall=${orToolsVersionBig}.2237
131+
131132
orToolsFile=or-tools_${arch}_${os}-${version}_cpp_v${orToolsVersionSmall}.tar.gz
132133
wget https://github.com/google/or-tools/releases/download/v${orToolsVersionBig}/${orToolsFile}
133134
orToolsPath="/opt/or-tools"
@@ -172,20 +173,28 @@ _installUbuntuPackages() {
172173
apt-get install -y \
173174
binutils \
174175
libgomp1 \
175-
libpython3.8 \
176176
libtcl \
177177
qt5-image-formats-plugins \
178178
tcl-tclreadline \
179179
wget
180180

181-
if [[ $1 == 22.04 ]] || [[ $1 == 22.10 ]]; then
181+
if [[ $1 == 22.10 ]]; then
182182
apt-get install -y \
183183
qtbase5-dev \
184184
qtchooser \
185185
qt5-qmake \
186-
qtbase5-dev-tools
186+
qtbase5-dev-tools \
187+
libpython3.11
188+
elif [[ $1 == 22.04 ]]; then
189+
apt-get install -y \
190+
qtbase5-dev \
191+
qtchooser \
192+
qt5-qmake \
193+
qtbase5-dev-tools \
194+
libpython3.8
187195
else
188-
apt-get install -y qt5-default
196+
apt-get install -y qt5-default \
197+
libpython3.8
189198
fi
190199

191200
# need the strip "hack" above to run on docker

0 commit comments

Comments
 (0)