From 3d5d0b4070e6b6ba9d0612d403bfe332e5948cde Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sun, 5 Jan 2020 00:25:14 -0600
Subject: [PATCH] runrole - remove installed lockout

---
 runrole | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/runrole b/runrole
index 7477c966d..6e7d019cf 100755
--- a/runrole
+++ b/runrole
@@ -23,49 +23,49 @@ if [[ $# -eq 0 ]] ; then
 fi
 
 if [ "$1" == "--reinstall" ]; then
-    ARGS="$ARGS --extra-vars reinstall=True"
+    ARGS="$ARGS -e reinstall=True"
     REINSTALL=1
     shift 1
 fi
 
-if ! grep -q "^""$1""_install: True" $LOCAL_VARS_FILE; then
-    echo "ERROR: $LOCAL_VARS_FILE must contain '""$1""_install: True'"
-    exit 1
-fi
+#if ! grep -q "^""$1""_install: True" $LOCAL_VARS_FILE; then
+#    echo "ERROR: $LOCAL_VARS_FILE must contain '""$1""_install: True'"
+#    exit 1
+#fi
 
 # Needed for Stages 1-3 if not installed yet
 if [ ! -f $IIAB_STATE_FILE ]; then
     touch $IIAB_STATE_FILE
 fi
 
-if ! grep -q $1_install $LOCAL_VARS_FILE; then
-    echo " $1_install: not found in $VARS"
-    echo " Please review $VARS and edit as required"
-    exit 1
-elif grep $1_install $LOCAL_VARS_FILE | grep -q --exclude "#" False; then
-    echo " $1_install: set to False found in $VARS"
-    echo " Please review $VARS and edit as required"
-    exit 1
-elif grep $1_install $LOCAL_VARS_FILE | grep -q "#"; then
-    echo " $1_install: commented out (#) in $VARS"
-    echo " Please review $VARS and edit as required"
-    exit 1
-else
-    if grep $1_install $LOCAL_VARS_FILE | grep -q --exclude "#" True; then
-        echo " $1_install: set to True found in $VARS"
-        echo " continuing...."
-    else
-        echo "somthing went wrong to get here"
-        exit 1
-    fi
-fi
+#if ! grep -q $1_install $LOCAL_VARS_FILE; then
+#    echo " $1_install: not found in $VARS"
+#    echo " Please review $VARS and edit as required"
+#    exit 1
+#elif grep $1_install $LOCAL_VARS_FILE | grep -q --exclude "#" False; then
+#    echo " $1_install: set to False found in $VARS"
+#    echo " Please review $VARS and edit as required"
+#    exit 1
+#elif grep $1_install $LOCAL_VARS_FILE | grep -q "#"; then
+#    echo " $1_install: commented out (#) in $VARS"
+#    echo " Please review $VARS and edit as required"
+#    exit 1
+#else
+#    if grep $1_install $LOCAL_VARS_FILE | grep -q --exclude "#" True; then
+#        echo " $1_install: set to True found in $VARS"
+#        echo " continuing...."
+#    else
+#        echo "somthing went wrong to get here"
+#        exit 1
+#    fi
+#fi
 
 if [ "$REINSTALL" == "1" ]; then
     if [ ! $1 == "internetarchive" ]; then # special handling
         if [ $1 == "calibre-web" ]; then # role directory & installed marker differ
             sed -i -e '/^calibreweb/d' $IIAB_STATE_FILE
-        elif [ $1 == "captive-portal" ]; then # role directory & installed marker differ
-            sed -i -e '/^captive_portal/d' $IIAB_STATE_FILE
+        elif [ $1 == "osm-vector-maps" ]; then # role directory & installed marker differ
+            sed -i -e '/^osm_vector_maps/d' $IIAB_STATE_FILE
         #elif [ $1 == "bluetooth" ]; then # role directory & installed marker differ
         #    sed -i -e '/^pan_bluetooth/d' $IIAB_STATE_FILE
         else