Skip to content

Commit ea3b7c2

Browse files
committed
Handle gLinux (rodete) in the DependencyInstaller.sh
Signed-off-by: Matt Liberty <[email protected]>
1 parent 0aa3fe5 commit ea3b7c2

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

etc/DependencyInstaller.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ _installUbuntuPackages() {
126126
zlib1g-dev
127127

128128
# install KLayout
129-
if _versionCompare $1 -ge 23.04; then
129+
if [[ $1 == "rodete" || $(_versionCompare "$1") -ge 23.04 ]]; then
130130
apt-get -y install --no-install-recommends klayout python3-pandas
131131
else
132132
arch=$(uname -m)
@@ -180,11 +180,13 @@ _installUbuntuPackages() {
180180
tee /etc/apt/sources.list.d/docker.list > /dev/null
181181

182182
apt-get -y update
183-
apt-get -y install --no-install-recommends \
184-
docker-ce \
185-
docker-ce-cli \
186-
containerd.io \
187-
docker-buildx-plugin
183+
if [[ $1 != "rodete" ]]; then
184+
apt-get -y install --no-install-recommends \
185+
docker-ce \
186+
docker-ce-cli \
187+
containerd.io \
188+
docker-buildx-plugin
189+
fi
188190
}
189191

190192
_installDarwinPackages() {
@@ -323,8 +325,11 @@ case "${os}" in
323325
_installCommon
324326
fi
325327
;;
326-
"Ubuntu" )
328+
"Ubuntu" | "Debian GNU/Linux rodete" )
327329
version=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release | sed 's/"//g')
330+
if [[ -z ${version} ]]; then
331+
version=$(awk -F= '/^VERSION_CODENAME/{print $2}' /etc/os-release | sed 's/"//g')
332+
fi
328333
if [[ ${CI} == "yes" ]]; then
329334
echo "Installing CI Tools"
330335
_installCI
@@ -335,7 +340,9 @@ case "${os}" in
335340
_installUbuntuCleanUp
336341
fi
337342
if [[ "${option}" == "common" || "${option}" == "all" ]]; then
338-
if _versionCompare ${version} -lt 23.04 ; then
343+
if [[ $version == "rodete" ]]; then
344+
echo "Skip common for rodete"
345+
elif _versionCompare ${version} -lt 23.04 ; then
339346
_installCommon
340347
fi
341348
fi

0 commit comments

Comments
 (0)