From be5df478e142ea0db95ab665cf1e7f875bc05a0a Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 3 Jul 2022 18:57:41 +0100
Subject: [PATCH 1/4] updated login.sh

---
 login.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/login.sh b/login.sh
index 042e2723..a2cf0de3 100755
--- a/login.sh
+++ b/login.sh
@@ -43,6 +43,10 @@ Currently supports:
   - Google Container Registry (GCR)
   - Google Artifact Registry (GAR)
   - Quay.io Container Registry (quay)
+
+See Also:
+
+    login.groovy in repo: https://github.com/HariSekhon/Jenkins
 "
 
 # used by usage() in lib/utils.sh

From 8b2429c7c973d437303921645fa30dd5cef528e9 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 3 Jul 2022 18:59:53 +0100
Subject: [PATCH 2/4] updated login.sh

---
 login.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/login.sh b/login.sh
index a2cf0de3..49f55942 100755
--- a/login.sh
+++ b/login.sh
@@ -99,10 +99,8 @@ ghcr(){
         return
     fi
     echo "Logging in to GitHub Container Registry (GHCR):"
-    if [ -n "${GH_TOKEN:-}" ]; then
-        docker login ghcr.io -u "$GITHUB_USER" --password-stdin <<< "$GH_TOKEN"
-    elif [ -n "${GITHUB_TOKEN:-}" ]; then
-        docker login ghcr.io -u "$GITHUB_USER" --password-stdin <<< "$GITHUB_TOKEN"
+    if [ -n "${GH_TOKEN:-}" ] || [ -n "${GITHUB_TOKEN:-}" ]; then
+        docker login ghcr.io -u "$GITHUB_USER" --password-stdin <<< "${GH_TOKEN:-$GITHUB_TOKEN}"
     fi
     echo
 }

From 7ef3f051563ae35216abe2d64e32d76868f40a92 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 3 Jul 2022 19:01:14 +0100
Subject: [PATCH 3/4] updated login.sh

---
 login.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/login.sh b/login.sh
index 49f55942..7f2a5bdb 100755
--- a/login.sh
+++ b/login.sh
@@ -109,7 +109,7 @@ aws(){
     if [ -n "${AWS_ACCESS_KEY_ID:-}" ] &&
        [ -n "${AWS_SECRET_ACCESS_KEY:-}" ] ||
        grep -Fxq "[${AWS_PROFILE:-nonexistent}]" ~/.aws/credentials 2>/dev/null; then
-        echo "AWS Cloud auth:"
+        echo "AWS CLI auth:"
         command aws sts get-caller-identity
         echo
     fi

From f8451bcc09bca8e83f89d0d905e5c09e72ad48a7 Mon Sep 17 00:00:00 2001
From: Hari Sekhon <harisekhon@gmail.com>
Date: Sun, 3 Jul 2022 23:09:43 +0100
Subject: [PATCH 4/4] updated login.sh

---
 login.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/login.sh b/login.sh
index 7f2a5bdb..6a36c541 100755
--- a/login.sh
+++ b/login.sh
@@ -195,11 +195,11 @@ gcr(){
 }
 
 acr(){
-    if [ -n "${ACR_NAME:-}" ]; then
+    if [ -n "${ACR_REGISTRY_NAME:-}" ]; then
         echo "Logging in to Azure Container Registry:"
         #local TOKEN
         #TOKEN="$(az acr credential show --name "$registry_name")"
-        az acr login --name "$ACR_NAME.azurecr.io"
+        az acr login --name "$ACR_REGISTRY_NAME.azurecr.io"
         echo
     fi
 }