From 8f0bb179905068fda72eebc1972fbdb63bf6d0a5 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 6 Jul 2022 02:39:29 -0400
Subject: [PATCH] Uncover IIAB_REMOTE_URL in 1 of 2 places (for both repos)

---
 roles/0-init/tasks/create_iiab_ini.yml |  4 ++--
 roles/0-init/tasks/main.yml            |  4 ++--
 scripts/iiab-summary                   | 18 ++++++++++++++++--
 scripts/local_facts.fact               | 13 +++++++++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/roles/0-init/tasks/create_iiab_ini.yml b/roles/0-init/tasks/create_iiab_ini.yml
index f27cb2e38..239ce570d 100644
--- a/roles/0-init/tasks/create_iiab_ini.yml
+++ b/roles/0-init/tasks/create_iiab_ini.yml
@@ -29,8 +29,8 @@
       value: "{{ ansible_architecture }}"
     - option: iiab_base_ver
       value: "{{ iiab_base_ver }}"
-    - option: iiab_remote
-      value: "{{ ansible_local.local_facts.iiab_remote }}"
+    - option: iiab_remote_url
+      value: "{{ ansible_local.local_facts.iiab_remote_url }}"
     - option: iiab_branch
       value: "{{ ansible_local.local_facts.iiab_branch }}"
     - option: iiab_commit
diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml
index b7d128124..cf5482144 100644
--- a/roles/0-init/tasks/main.yml
+++ b/roles/0-init/tasks/main.yml
@@ -68,8 +68,8 @@
       value: "{{ iiab_base_ver }}"
     - option: iiab_revision
       value: "{{ iiab_revision }}"
-    - option: iiab_remote
-      value: "{{ ansible_local.local_facts.iiab_remote }}"
+    - option: iiab_remote_url
+      value: "{{ ansible_local.local_facts.iiab_remote_url }}"
     - option: runtime_branch
       value: "{{ ansible_local.local_facts.iiab_branch }}"
     - option: runtime_commit
diff --git a/scripts/iiab-summary b/scripts/iiab-summary
index 40f423584..f1b7179a5 100755
--- a/scripts/iiab-summary
+++ b/scripts/iiab-summary
@@ -12,7 +12,14 @@ COMMITS1=$(git log "$TAG1..HEAD" --oneline | wc -l)
 PR_COUNT1=$(git log "$TAG1..HEAD" --oneline --grep='Merge pull request' | wc -l)
 COMMIT_MSG1=$(git log --format=%B -1 | head -1)
 BRANCH1=$(git branch --show-current)
-REMOTE_URL1=$(git config remote.$(git config branch.$BRANCH1.remote).url)
+REMOTE_URL1="none"
+tmp=$(git config branch.$BRANCH1.remote) && {
+    if [[ $tmp =~ ^"https://" ]]; then
+        REMOTE_URL1=$tmp
+    else
+        REMOTE_URL1=$(git config remote.$tmp.url)
+    fi
+}
 
 git config --global --add safe.directory /opt/iiab/iiab-admin-console    # Nec below, if non-root
 cd /opt/iiab/iiab-admin-console
@@ -22,7 +29,14 @@ COMMITS2=$(git log "$TAG2..HEAD" --oneline | wc -l)
 PR_COUNT2=$(git log "$TAG2..HEAD" --oneline --grep='Merge pull request' | wc -l)
 COMMIT_MSG2=$(git log --format=%B -1 | head -1)
 BRANCH2=$(git branch --show-current)
-REMOTE_URL2=$(git config remote.$(git config branch.$BRANCH2.remote).url)
+REMOTE_URL2="none"
+tmp=$(git config branch.$BRANCH2.remote) && {
+    if [[ $tmp =~ ^"https://" ]]; then
+        REMOTE_URL2=$tmp
+    else
+        REMOTE_URL2=$(git config remote.$tmp.url)
+    fi
+}
 
 echo "$(grep install_date /etc/iiab/iiab.ini)   Current TZ: $(date +%Z)"
 echo
diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact
index a0471c95a..3c50c360e 100755
--- a/scripts/local_facts.fact
+++ b/scripts/local_facts.fact
@@ -12,7 +12,7 @@
 STAGE=0
 OS="none"
 VERSION_ID="none"    # This var's combined with the above, before being output
-IIAB_REMOTE="none"
+IIAB_REMOTE_URL="none"
 IIAB_BRANCH="none"
 IIAB_COMMIT="none"
 IIAB_RECENT_TAG="none"
@@ -91,8 +91,13 @@ esac
 tmp=$(git rev-parse --abbrev-ref HEAD) &&
     IIAB_BRANCH=$tmp
 
-tmp=$(git config remote.$(git config branch.$IIAB_BRANCH.remote).url) &&
-    IIAB_REMOTE=$tmp
+tmp=$(git config branch.$IIAB_BRANCH.remote) && {
+    if [[ $tmp =~ ^"https://" ]]; then
+        IIAB_REMOTE_URL=$tmp
+    else
+        IIAB_REMOTE_URL=$(git config remote.$tmp.url)
+    fi
+}
 
 tmp=$(git rev-parse --verify HEAD) &&
     IIAB_COMMIT=$tmp
@@ -145,7 +150,7 @@ cat <<EOF
 "dhcpcd"                  : "$DHCPCD",
 "network_manager"         : "$NETWORK_MANAGER",
 "systemd_networkd"        : "$SYSTEMD_NETWORKD",
-"iiab_remote"             : "$IIAB_REMOTE",
+"iiab_remote_url"         : "$IIAB_REMOTE_URL",
 "iiab_branch"             : "$IIAB_BRANCH",
 "iiab_commit"             : "$IIAB_COMMIT",
 "iiab_recent_tag"         : "$IIAB_RECENT_TAG",