From 70cc74ac4731c00f1a0a165c3ab8be3b2d6d5734 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 18 Apr 2022 09:55:35 -0400
Subject: [PATCH 1/4] templates/iiab-remoteit: Warn if
 /etc/remoteit/config.json exists...and try it?

---
 roles/remoteit/templates/iiab-remoteit | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/roles/remoteit/templates/iiab-remoteit b/roles/remoteit/templates/iiab-remoteit
index 94f04e27d..a13bf20ef 100755
--- a/roles/remoteit/templates/iiab-remoteit
+++ b/roles/remoteit/templates/iiab-remoteit
@@ -50,6 +50,28 @@ fi
 
 echo -e "\nThis IIAB must be online to begin!\n"
 
+if [ -f /etc/remoteit/config.json ]; then
+    echo -en "For fresh registration let's remove /etc/remoteit/config.json, Ok? [Y/n] "
+    read -n 1 -r ans < /dev/tty    # Prompt for a single character
+    echo; echo
+
+    if [[ $ans != "y" && $ans != "Y" ]]; then
+        echo -e "Let's try to enable remote.it, with your existing /etc/remoteit/config.json...\n"
+
+        systemctl enable connectd
+        systemctl restart connectd
+        systemctl enable schannel
+
+        if grep -q '^remoteit_enabled:' /etc/iiab/local_vars.yml; then
+            sed -i "s/^remoteit_enabled:.*/remoteit_enabled: True/" /etc/iiab/local_vars.yml
+        else
+            echo "remoteit_enabled: True" >> /etc/iiab/local_vars.yml
+        fi
+
+        exit 0
+    fi
+fi
+
 echo -en "\e[1mOptionally purge + install latest remote.it Device Package? [y/N]\e[0m "
 read -n 1 -r ans < /dev/tty    # Prompt for a single character
 echo; echo

From e072c7027af9180c89be82ee0c84eb136ade3b6c Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:07:12 -0400
Subject: [PATCH 2/4] Fix iiab-remoteit + Cleaner instructions

---
 roles/remoteit/README.md               |  8 ++++++--
 roles/remoteit/templates/iiab-remoteit | 20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/roles/remoteit/README.md b/roles/remoteit/README.md
index 489af24fb..9808235da 100644
--- a/roles/remoteit/README.md
+++ b/roles/remoteit/README.md
@@ -24,16 +24,20 @@ Prerequisite: Find any IIAB with `remoteit_installed: True` in `/etc/iiab/iiab_s
 
 1. Run `sudo iiab-remoteit` to enable remote.it on your IIAB:
 
-   - Hit [Enter] <!-- (repeatedly if necessary, to accept all defaults) --> if this is a fresh install, to quickly generate a claim code for your IIAB.
+   - Hit [Enter] (repeatedly if necessary, to accept all defaults) to quickly generate a claim code for your IIAB.
 
      The claim code must be used [within 24 hours](https://docs.remote.it/device-package/installation#2.-update-your-package-manager-and-install) (Step 2., below).
 
      Just FYI a copy is also put in: `/etc/remoteit/config.json`
 
-   - EXCEPTION: If a remote.it license key happens to be found in `/etc/iiab/local_vars.yml` or `/etc/remoteit/registration`, that will be tried first (prior to, and instead of generating a claim code).
+   - EXCEPTION #1: If a remote.it license key happens to be found in `/etc/iiab/local_vars.yml` or `/etc/remoteit/registration`, that will be tried first (prior to, and instead of generating a claim code).
 
      *If the license key works, you will not get a claim code (as the IIAB device auto-registers to your remote.it account) so jump to Step 5. in OPTION #2.*
 
+   - EXCEPTION #2: If you have an existing `/etc/remoteit/config.json` you will be given the option to try that (e.g. if you already registered the IIAB device to your remote.it account).
+
+     *Verify that by jumping to Step 5. in OPTION #2.*
+
 <!--
 1. Connect your IIAB device to the Internet.
 
diff --git a/roles/remoteit/templates/iiab-remoteit b/roles/remoteit/templates/iiab-remoteit
index a13bf20ef..0ef72776e 100755
--- a/roles/remoteit/templates/iiab-remoteit
+++ b/roles/remoteit/templates/iiab-remoteit
@@ -48,14 +48,14 @@ elif [ -f /etc/remoteit/registration ]; then    # Zero size, e.g. due to touch
     echo -e "Empty /etc/remoteit/registration deleted, so claim code can be generated.\n"
 fi
 
-echo -e "\nThis IIAB must be online to begin!\n"
+echo -e "\nThis IIAB must be online to begin!"
 
 if [ -f /etc/remoteit/config.json ]; then
-    echo -en "For fresh registration let's remove /etc/remoteit/config.json, Ok? [Y/n] "
+    echo -en "\n\e[1mFor fresh registration let's remove /etc/remoteit/config.json, Ok? [Y/n]\e[0m "
     read -n 1 -r ans < /dev/tty    # Prompt for a single character
     echo; echo
 
-    if [[ $ans != "y" && $ans != "Y" ]]; then
+    if [[ $ans = "n" || $ans = "N" ]]; then
         echo -e "Let's try to enable remote.it, with your existing /etc/remoteit/config.json...\n"
 
         systemctl enable connectd
@@ -68,11 +68,23 @@ if [ -f /etc/remoteit/config.json ]; then
             echo "remoteit_enabled: True" >> /etc/iiab/local_vars.yml
         fi
 
+        echo -e "\e[1m\nYou can now check for this IIAB device in your https://remote.it account."
+        echo -e "(IF your pre-existing /etc/remoteit/config.json was working in the past!)\e[0m\n"
+
+        echo -e "\e[1m1) Log in to https://remote.it or its Desktop Application on your own PC:\e[0m"
+        echo -e "   https://remote.it/download/\n"
+
+        echo -e '\e[1m2) In the "Devices" section on the left, check that your IIAB is now present:\e[0m'
+        echo -e "   https://docs.remote.it/software/device-package/installation#3.-claim-and-register-the-device\n"
+        
+        echo -e "\e[1m3) Authorize services/ports (e.g. SSH, HTTP, etc) for your IIAB device:\e[0m"
+        echo -e "   https://docs.remote.it/software/device-package/installation#4.-set-up-services-on-your-device\n"
+
         exit 0
     fi
 fi
 
-echo -en "\e[1mOptionally purge + install latest remote.it Device Package? [y/N]\e[0m "
+echo -en "\e[1m\nOptionally purge + install latest remote.it Device Package? [y/N]\e[0m "
 read -n 1 -r ans < /dev/tty    # Prompt for a single character
 echo; echo
 

From e12908c6d6ed0320f8c43e479453537aad48d6d4 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:12:59 -0400
Subject: [PATCH 3/4] remoteit/README.md: Clarify option to preserve
 /etc/remoteit/config.json

---
 roles/remoteit/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/remoteit/README.md b/roles/remoteit/README.md
index 9808235da..2479f8384 100644
--- a/roles/remoteit/README.md
+++ b/roles/remoteit/README.md
@@ -36,7 +36,7 @@ Prerequisite: Find any IIAB with `remoteit_installed: True` in `/etc/iiab/iiab_s
 
    - EXCEPTION #2: If you have an existing `/etc/remoteit/config.json` you will be given the option to try that (e.g. if you already registered the IIAB device to your remote.it account).
 
-     *Verify that by jumping to Step 5. in OPTION #2.*
+     *Verify that after `sudo iiab-remoteit` completes, by jumping to Step 5. in OPTION #2.*
 
 <!--
 1. Connect your IIAB device to the Internet.

From d614bd469d560fc52c1ae40ed3fe9b9eb2609c59 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Mon, 18 Apr 2022 11:23:45 -0400
Subject: [PATCH 4/4] templates/iiab-remoteit: Clean up lines #s in comments

---
 roles/remoteit/templates/iiab-remoteit | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/remoteit/templates/iiab-remoteit b/roles/remoteit/templates/iiab-remoteit
index 0ef72776e..32cf2c192 100755
--- a/roles/remoteit/templates/iiab-remoteit
+++ b/roles/remoteit/templates/iiab-remoteit
@@ -38,7 +38,7 @@ if [[ $KEY1 != "" ]]; then
     echo -e "Removed remoteit_license_key line from /etc/iiab/local_vars.yml\n"
 fi
 
-# /etc/remoteit/registration consequences summarized on lines 80-85
+# /etc/remoteit/registration consequences summarized on lines 114-119
 if [ -s /etc/remoteit/registration ]; then    # Non-zero size
     cp -p /etc/remoteit/registration /tmp/etc.remoteit.registration
     echo -e "License key $(cat /etc/remoteit/registration) will be attempted."
@@ -55,7 +55,7 @@ if [ -f /etc/remoteit/config.json ]; then
     read -n 1 -r ans < /dev/tty    # Prompt for a single character
     echo; echo
 
-    if [[ $ans = "n" || $ans = "N" ]]; then
+    if [[ $ans = "n" || $ans = "N" ]]; then    # Nearly the same as Lines 142-189
         echo -e "Let's try to enable remote.it, with your existing /etc/remoteit/config.json...\n"
 
         systemctl enable connectd