Resolve "Testing on later versions of Ubuntu"

This commit is contained in:
Steven Foerster
2021-07-15 00:34:02 +00:00
parent 09dc4d09f8
commit 85f2a3a38b
4 changed files with 139 additions and 56 deletions
+12 -1
View File
@@ -6,7 +6,18 @@ figlet "Mistborn: Installing Docker"
sudo apt update
sudo -E apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev
if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
# Ubuntu version >= 20.04
set +e
vercomp "$VERSION_ID" "19.10"
case $? in
0) op='=';;
1) op='>';;
2) op='<';;
esac
set -e
if [ "$DISTRO" == "ubuntu" ] && [ "$op" == ">" ]; then
echo "Automated Docker install"
sudo -E apt-get install -y docker-compose
else
+2
View File
@@ -42,3 +42,5 @@ if [ $? -eq 0 ]; then
sudo dpkg -i libseccomp2_2.5.1-1_$(dpkg --print-architecture).deb
popd
fi
set -e
+36
View File
@@ -15,3 +15,39 @@ fi
figlet "UNAME: $UNAME"
figlet "DISTRO: $DISTRO"
figlet "VERSION: $VERSION_ID"
vercomp () {
# case $? in
# 0) op='=';;
# 1) op='>';;
# 2) op='<';;
if [[ $1 == $2 ]]
then
return 0
fi
local IFS=.
local i ver1=($1) ver2=($2)
# fill empty fields in ver1 with zeros
for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
do
ver1[i]=0
done
for ((i=0; i<${#ver1[@]}; i++))
do
if [[ -z ${ver2[i]} ]]
then
# fill empty fields in ver2 with zeros
ver2[i]=0
fi
if ((10#${ver1[i]} > 10#${ver2[i]}))
then
return 1
fi
if ((10#${ver1[i]} < 10#${ver2[i]}))
then
return 2
fi
done
return 0
}