From d0bf03afe1b31da3d4d880cf6e498430f87f15c3 Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Mon, 16 Jul 2018 18:14:20 -0400
Subject: [PATCH] Ensuring basics are installed

---
 Setup_Linux_Mac.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Setup_Linux_Mac.sh b/Setup_Linux_Mac.sh
index ba08cd8..58e78c8 100755
--- a/Setup_Linux_Mac.sh
+++ b/Setup_Linux_Mac.sh
@@ -62,6 +62,11 @@ if [ "$install" == "1" ]; then
         fi
         # UBUNTU Version <===================================================
 
+        echo ""
+        echo ""
+        echo "Verifying the basics are installed."
+        echo ""
+        sudo apt update && sudo apt install unzip git build-essential apt-transport-https ca-certificates curl software-properties-common -y
         echo ""
         echo ""
         echo "Do you have Docker installed?"
@@ -75,7 +80,6 @@ if [ "$install" == "1" ]; then
         if [ "$docker" == "1" ]; then
             echo "Attempting to install Docker now"
             echo ""
-            sudo apt update && sudo apt install git build-essential apt-transport-https ca-certificates curl software-properties-common -y
             curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
             sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $vers stable"
             sudo apt update && sudo apt install docker-ce docker-compose -y
@@ -107,6 +111,11 @@ if [ "$install" == "1" ]; then
         su -c 'yum update && yum install git'
         echo ""
         echo ""
+        echo "Verifying the basics are installed."
+        echo ""
+        su -c 'yum update && yum install unzip git build-essential apt-transport-https ca-certificates curl software-properties-common'
+        echo ""
+        echo ""
         echo "Do you have Java OpenJDK installed already?"
         echo ""
         echo "${RED}1${NC} - Install for me!"
@@ -161,6 +170,11 @@ if [ "$install" == "1" ]; then
         fi
         # Mac Brew <===================================================
 
+        echo ""
+        echo ""
+        echo "Verifying the basics are installed."
+        echo ""
+        brew install unzip wget git curl
         echo ""
         echo ""
         echo "Do you have Java OpenJDK 8 installed already?"
@@ -189,7 +203,7 @@ if [ "$install" == "1" ]; then
         # Mac Docker ===================================================>
         if [ "$docker" == "1" ]; then
             echo "Downloading the Docker for Mac installer"
-            brew install wget
+            echo ""
             wget https://download.docker.com/mac/stable/Docker.dmg
             hdiutil attach Docker.dmg
             echo ""