From 9bff945c6c3dbca7436c20b5caa0f27e8f6243ff Mon Sep 17 00:00:00 2001
From: Steven Foerster <steven@cyber5k.com>
Date: Wed, 22 Apr 2020 12:51:56 -0400
Subject: [PATCH] version id

---
 scripts/subinstallers/docker.sh        | 75 +++-----------------------
 scripts/subinstallers/docker_manual.sh | 72 +++++++++++++++++++++++++
 scripts/subinstallers/platform.sh      |  3 ++
 3 files changed, 81 insertions(+), 69 deletions(-)
 create mode 100755 scripts/subinstallers/docker_manual.sh

diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh
index b962864..3a8b6c1 100755
--- a/scripts/subinstallers/docker.sh
+++ b/scripts/subinstallers/docker.sh
@@ -1,72 +1,9 @@
 #!/bin/bash
 
-# Docker
-figlet "Mistborn: Installing Docker"
-
-# dependencies
-echo "Installing Docker dependencies"
-sudo apt-get install -y \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-
-# Docker repo key
-echo "Adding docker repository key"
-if [ "$DISTRO" == "ubuntu" ]; then
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-elif [ "$DISTRO" == "debian" ]; then
-    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
-elif [ "$DISTRO" == "raspbian" ]; then
-    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add -
-fi
-
-# Docker repo to source list
-echo "Adding docker to sources list"
-if [ "$DISTRO" == "ubuntu" ]; then
-    sudo add-apt-repository -y \
-       "deb https://download.docker.com/linux/ubuntu \
-       $(lsb_release -cs) \
-       stable"
-elif [ "$DISTRO" == "debian" ]; then
-    sudo add-apt-repository -y \
-   "deb https://download.docker.com/linux/debian \
-   $(lsb_release -cs) \
-   stable"
-elif [ "$DISTRO" == "raspbian" ]; then
-    echo "deb [arch=armhf] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
-     $(lsb_release -cs) stable" | \
-    sudo tee /etc/apt/sources.list.d/docker.list
+if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then
+    echo "Automated Docker install"
+    sudo apt-get install docker-compose
+else
+    echo "Manual Docker installation"
+    source ./scripts/subinstallers/docker_manual.sh
 fi
-
-# install Docker
-echo "Installing docker"
-sudo apt-get update
-
-if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
-    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-elif [ "$DISTRO" == "raspbian" ]; then
-    sudo apt install -y --no-install-recommends \
-    docker-ce \
-    cgroupfs-mount
-fi
-
-# Docker group
-sudo usermod -aG docker $USER
-
-# Docker Compose
-echo "Installing Docker Compose"
-#if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
-#    sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-#    sudo chmod +x /usr/local/bin/docker-compose
-#elif [ "$DISTRO" == "raspbian" ]; then
-# Install required packages
-sudo apt update
-sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
-
-# Install Docker Compose from pip
-# This might take a while
-sudo pip3 install docker-compose
-#fi
-
diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh
new file mode 100755
index 0000000..b962864
--- /dev/null
+++ b/scripts/subinstallers/docker_manual.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Docker
+figlet "Mistborn: Installing Docker"
+
+# dependencies
+echo "Installing Docker dependencies"
+sudo apt-get install -y \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg-agent \
+    software-properties-common
+
+# Docker repo key
+echo "Adding docker repository key"
+if [ "$DISTRO" == "ubuntu" ]; then
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+elif [ "$DISTRO" == "debian" ]; then
+    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
+elif [ "$DISTRO" == "raspbian" ]; then
+    curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | sudo apt-key add -
+fi
+
+# Docker repo to source list
+echo "Adding docker to sources list"
+if [ "$DISTRO" == "ubuntu" ]; then
+    sudo add-apt-repository -y \
+       "deb https://download.docker.com/linux/ubuntu \
+       $(lsb_release -cs) \
+       stable"
+elif [ "$DISTRO" == "debian" ]; then
+    sudo add-apt-repository -y \
+   "deb https://download.docker.com/linux/debian \
+   $(lsb_release -cs) \
+   stable"
+elif [ "$DISTRO" == "raspbian" ]; then
+    echo "deb [arch=armhf] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \
+     $(lsb_release -cs) stable" | \
+    sudo tee /etc/apt/sources.list.d/docker.list
+fi
+
+# install Docker
+echo "Installing docker"
+sudo apt-get update
+
+if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
+    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+elif [ "$DISTRO" == "raspbian" ]; then
+    sudo apt install -y --no-install-recommends \
+    docker-ce \
+    cgroupfs-mount
+fi
+
+# Docker group
+sudo usermod -aG docker $USER
+
+# Docker Compose
+echo "Installing Docker Compose"
+#if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then
+#    sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+#    sudo chmod +x /usr/local/bin/docker-compose
+#elif [ "$DISTRO" == "raspbian" ]; then
+# Install required packages
+sudo apt update
+sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
+
+# Install Docker Compose from pip
+# This might take a while
+sudo pip3 install docker-compose
+#fi
+
diff --git a/scripts/subinstallers/platform.sh b/scripts/subinstallers/platform.sh
index 3c18fce..305bf16 100755
--- a/scripts/subinstallers/platform.sh
+++ b/scripts/subinstallers/platform.sh
@@ -4,11 +4,14 @@
 # Determine OS platform
 UNAME=$(uname | tr "[:upper:]" "[:lower:]")
 DISTRO=""
+VERSION_ID=""
 # If Linux, try to determine specific distribution
 if [ "$UNAME" == "linux" ]; then
     # use /etc/os-release to get distro 
     DISTRO=$(cat /etc/os-release | awk -F= '/^ID=/{print $2}')
+    VERSION_ID=$(cat /etc/os-release | awk -F= '/^VERSION_ID=/{print $2}')
 fi
 
 figlet "UNAME: $UNAME"
 figlet "DISTRO: $DISTRO"
+figlet "VERSION: $VERSION_ID"