From 0d0e41be7c1a0e3b571a83f5d9658a5e8231db89 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Fri, 6 Nov 2020 18:09:02 -0500
Subject: [PATCH 1/4] runrole: explain unknown flag (--reinstall) with more
 context

---
 runrole | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/runrole b/runrole
index 2460f01c0..3977f4c13 100755
--- a/runrole
+++ b/runrole
@@ -5,6 +5,7 @@ LOCAL_VARS_FILE=/etc/iiab/local_vars.yml
 IIAB_STATE_FILE=/etc/iiab/iiab_state.yml
 ROLE_VAR=""
 INSTALL=false
+ENABLED=false
 REINSTALL=false
 CWD=`pwd`
 ARGS="--extra-vars {"    # bash forces {...} to '{...}' for Ansible, SEE BOTTOM
@@ -72,8 +73,16 @@ else
     if grep -q "^${ROLE_VAR}_" $IIAB_STATE_FILE; then
         echo -e "\e[1mWARNING: $IIAB_STATE_FILE already has this/these line(s):\e[0m\n"
         grep "^${ROLE_VAR}_" $IIAB_STATE_FILE; echo
-        echo -e "To reinstall it, run: ./runrole --reinstall $1\n"
-        echo -n "Or continue, e.g. to enable/disable it based on var '${ROLE_VAR}_enabled' ? [Y/n] "
+        echo -e "If you prefer to reinstall it, run: ./runrole --reinstall $1\n"
+
+        grep -q "^${ROLE_VAR}_enabled:\s\+[Tt]rue\b" $DEFAULT_VARS_FILE && ENABLED=true
+        grep -q "^${ROLE_VAR}_enabled:\s\+[Ff]alse\b" $LOCAL_VARS_FILE && ENABLED=false
+        grep -q "^${ROLE_VAR}_enabled:\s\+[Tt]rue\b" $LOCAL_VARS_FILE && ENABLED=true
+        if $ENABLED; then
+            echo -n "Or just continue, e.g. to enforce var '${ROLE_VAR}_enabled: True' ? [Y/n] "
+        else
+            echo -n "Or just continue, e.g. to enforce var '${ROLE_VAR}_enabled: False' ? [Y/n] "
+        fi
         read ans < /dev/tty
         echo
         [ "$ans" = "n" ] || [ "$ans" = "N" ] &&

From 1ce74c939cdf6753f82c0c63915f38b519b96bdd Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Fri, 6 Nov 2020 18:20:49 -0500
Subject: [PATCH 2/4] runrole: enable-or-disable verbiage

---
 runrole | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runrole b/runrole
index 3977f4c13..c439b8539 100755
--- a/runrole
+++ b/runrole
@@ -79,9 +79,9 @@ else
         grep -q "^${ROLE_VAR}_enabled:\s\+[Ff]alse\b" $LOCAL_VARS_FILE && ENABLED=false
         grep -q "^${ROLE_VAR}_enabled:\s\+[Tt]rue\b" $LOCAL_VARS_FILE && ENABLED=true
         if $ENABLED; then
-            echo -n "Or just continue, e.g. to enforce var '${ROLE_VAR}_enabled: True' ? [Y/n] "
+            echo -n "Or just continue, to try to enforce var '${ROLE_VAR}_enabled: True' ? [Y/n] "
         else
-            echo -n "Or just continue, e.g. to enforce var '${ROLE_VAR}_enabled: False' ? [Y/n] "
+            echo -n "Or just continue, to try to enforce var '${ROLE_VAR}_enabled: False' ? [Y/n] "
         fi
         read ans < /dev/tty
         echo

From 67c4f4a19480ad0e3878f43eb945fec83825c12e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Fri, 6 Nov 2020 18:27:38 -0500
Subject: [PATCH 3/4] runrole clarif: 'force '${ROLE_VAR}_install: True'
 directly to Ansible'

---
 runrole | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runrole b/runrole
index c439b8539..34fbca0f8 100755
--- a/runrole
+++ b/runrole
@@ -96,7 +96,7 @@ grep -q "^${ROLE_VAR}_install:\s\+[Tt]rue\b" $LOCAL_VARS_FILE && INSTALL=true
 if ! $INSTALL; then
     echo -e "\e[1m'${ROLE_VAR}_install: True' MUST BE SET!\e[0m\n"
     echo -e "Usually it's best to set variables in: $LOCAL_VARS_FILE\n"
-    echo -n "Just for now, pass '${ROLE_VAR}_install: True' directly to Ansible? [Y/n] "
+    echo -n "Just for now, force '${ROLE_VAR}_install: True' directly to Ansible? [Y/n] "
     read ans < /dev/tty
     echo
     [ "$ans" = "n" ] || [ "$ans" = "N" ] &&

From 026b6d059b8f8c76e2638d0a8b33b9a7097a5a72 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:09:15 -0500
Subject: [PATCH 4/4] runrole: consistent "line(s)" grammar across all 3 cases

---
 runrole | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runrole b/runrole
index 34fbca0f8..ac500dac6 100755
--- a/runrole
+++ b/runrole
@@ -65,13 +65,13 @@ if $REINSTALL; then   # Add '_' so '--reinstall calibre' doesn't zap calibreweb
         grep "^${ROLE_VAR}_" $IIAB_STATE_FILE; echo
         sed -i "/^${ROLE_VAR}_/d" $IIAB_STATE_FILE
     else
-        echo -e "\e[1mERROR: $IIAB_STATE_FILE has no lines that begin with '${ROLE_VAR}_'\e[0m\n"
+        echo -e "\e[1mERROR: $IIAB_STATE_FILE has no line(s) that begin with '${ROLE_VAR}_'\e[0m\n"
         echo -e "Try again without the '--reinstall' flag?\n"
         exit 1
     fi
 else
     if grep -q "^${ROLE_VAR}_" $IIAB_STATE_FILE; then
-        echo -e "\e[1mWARNING: $IIAB_STATE_FILE already has this/these line(s):\e[0m\n"
+        echo -e "\e[1mWARNING: $IIAB_STATE_FILE already has these line(s):\e[0m\n"
         grep "^${ROLE_VAR}_" $IIAB_STATE_FILE; echo
         echo -e "If you prefer to reinstall it, run: ./runrole --reinstall $1\n"