From 8f361d4c513c867812271e5ea33ca12129632c42 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 13 Dec 2017 04:45:04 -0500
Subject: [PATCH] simplified each [[ `CMD` ]] + ansible version logic

---
 iiab-install | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/iiab-install b/iiab-install
index dd6711709..58ac12191 100755
--- a/iiab-install
+++ b/iiab-install
@@ -44,7 +44,7 @@ function version_gt() { [ "$(printf '%s\n' "$@" | sort -V | head -1)" != "$1" ];
 # updates on 4.9.41-v7+ broke bridging, WiFi AP & OpenVPN in Oct/Nov 2017.
 CURR_KERN=`uname -r`
 echo "Found Kernel "$CURR_KERN""
-if [ "$OS" == "raspbian" ] && version_gt $MIN_RPI_KERN $CURR_KERN; then
+if [ "$OS" == "raspbian" ] && version_gt $MIN_RPI_KERN $CURR_KERN ; then
     echo -e "\nEXITING: Kernel "$MIN_RPI_KERN" or higher required with Raspbian."
     echo "PLEASE RUN 'apt update' then 'apt install raspberrypi-kernel' then reboot."
     echo "IIAB INSTALL INSTRUCTIONS: https://github.com/iiab/iiab/wiki/IIAB-Installation"
@@ -54,11 +54,13 @@ fi
 # Verify that a recent enough version of Ansible is installed.  See #449.  The
 # "include:" command was inconsistently implemented prior to Ansible 2.4.x.x
 CURR_ANSIBLE_VER=0
-if [[ `type -P ansible` ]]; then
-    CURR_ANSIBLE_VER=`ansible --version | head -1 | sed -e 's/.* //'`
+if type -P ansible ; then
+    #CURR_ANSIBLE_VER=`ansible --version | head -1 | sed -e 's/.* //'`
+    #CURR_ANSIBLE_VER=`ansible --version | head -1 | cut -f 2 -d " "`
+    CURR_ANSIBLE_VER=`ansible --version | head -1 | awk '{print $2}'`
     echo "Found Ansible "$CURR_ANSIBLE_VER""
 fi
-if version_gt $MIN_ANSIBLE_VER $CURR_ANSIBLE_VER; then
+if version_gt $MIN_ANSIBLE_VER $CURR_ANSIBLE_VER ; then
     echo -e "\nEXITING: Ansible "$MIN_ANSIBLE_VER" or higher required."
     echo "PLEASE RUN './scripts/ansible' to install the latest Ansible from PPA or RPM."
     echo "'ansible --version' and 'apt -a list ansible' can also be useful here.  Try"
@@ -71,7 +73,7 @@ fi
 # (in /etc/iiab/iiab.env) of the highest completed Stage.  Avoid repetition!
 STAGE=0
 if [ -f /etc/iiab/iiab.env ]; then
-    if [[ `grep STAGE= /etc/iiab/iiab.env` ]]; then
+    if grep -q STAGE= /etc/iiab/iiab.env ; then
         source /etc/iiab/iiab.env
         echo "Extracted STAGE="$STAGE" (counter) from /etc/iiab/iiab.env"
         if ! [ "$STAGE" -eq "$STAGE" ] 2> /dev/null; then
@@ -83,7 +85,7 @@ if [ -f /etc/iiab/iiab.env ]; then
         fi
     fi
 # if XSCE is present resolveconf will not be
-    if [[ `grep XSCE /etc/iiab/iiab.env` ]]; then
+    if grep -q XSCE /etc/iiab/iiab.env ; then
         STAGE=0
         rm /etc/iiab/iiab.env
         echo "Removed /etc/iiab/iiab.env effectively resetting STAGE (counter)."