From 3c593c2ca30861a15be8700482c969c8f51d8bb8 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 20 Nov 2017 14:06:35 -0600 Subject: [PATCH 1/3] revise reinstall --- iiab-install | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 32b2c1c64..b98b1b3dc 100755 --- a/iiab-install +++ b/iiab-install @@ -82,10 +82,16 @@ if [ -f /etc/iiab/iiab.env ]; then exit 1 fi fi - if [[ `grep XSCE /etc/iiab/iiab.env` ]] || [ "$1" == "--reinstall" ]; then +# if XSCE is present resolveconf will not be + if [[ `grep XSCE /etc/iiab/iiab.env` ]]; then STAGE=0 rm /etc/iiab/iiab.env echo "Removed /etc/iiab/iiab.env effectively resetting STAGE (counter)." + fi + if [ "$1" == "--reinstall" ]; then + STAGE=0 + sed -i 's/^STAGE=.*/STAGE=0/' /etc/iiab/iiab.env + echo "Wrote STAGE=0 (counter) to /etc/iiab/iiab.env" elif [ "$STAGE" -ge 2 ] && [ "$1" == "--debug" ]; then STAGE=2 sed -i 's/^STAGE=.*/STAGE=2/' /etc/iiab/iiab.env From 5b3126278160d4d40392d28689e493b9413a8fca Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 20 Nov 2017 14:39:10 -0600 Subject: [PATCH 2/3] elif --- iiab-install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iiab-install b/iiab-install index b98b1b3dc..eeb489e14 100755 --- a/iiab-install +++ b/iiab-install @@ -87,8 +87,7 @@ if [ -f /etc/iiab/iiab.env ]; then STAGE=0 rm /etc/iiab/iiab.env echo "Removed /etc/iiab/iiab.env effectively resetting STAGE (counter)." - fi - if [ "$1" == "--reinstall" ]; then + elif [ "$1" == "--reinstall" ]; then STAGE=0 sed -i 's/^STAGE=.*/STAGE=0/' /etc/iiab/iiab.env echo "Wrote STAGE=0 (counter) to /etc/iiab/iiab.env" From 689b060a5b285429782c1ea631912ac37469f237 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 20 Nov 2017 16:54:53 -0500 Subject: [PATCH 3/3] single space removed --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index eeb489e14..05ae81746 100755 --- a/iiab-install +++ b/iiab-install @@ -87,7 +87,7 @@ if [ -f /etc/iiab/iiab.env ]; then STAGE=0 rm /etc/iiab/iiab.env echo "Removed /etc/iiab/iiab.env effectively resetting STAGE (counter)." - elif [ "$1" == "--reinstall" ]; then + elif [ "$1" == "--reinstall" ]; then STAGE=0 sed -i 's/^STAGE=.*/STAGE=0/' /etc/iiab/iiab.env echo "Wrote STAGE=0 (counter) to /etc/iiab/iiab.env"