From 42d4655b283a8f045d9398326a8e61259799c379 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 14 Jul 2021 17:28:26 -0400 Subject: [PATCH] docker on ubuntu --- scripts/subinstallers/docker.sh | 11 +++++++++- scripts/subinstallers/platform.sh | 36 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh index cdc83fa..623043c 100755 --- a/scripts/subinstallers/docker.sh +++ b/scripts/subinstallers/docker.sh @@ -6,7 +6,16 @@ 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 + +vercomp "$VERSION_ID" "19.10" +# case $? in +# 0) op='=';; +# 1) op='>';; +# 2) op='<';; +# esac + +if [ "$DISTRO" == "ubuntu" ] && [ "$?" == "1" ]; then echo "Automated Docker install" sudo -E apt-get install -y docker-compose else diff --git a/scripts/subinstallers/platform.sh b/scripts/subinstallers/platform.sh index a619a95..2db71b4 100755 --- a/scripts/subinstallers/platform.sh +++ b/scripts/subinstallers/platform.sh @@ -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 +} \ No newline at end of file