From 1ab8ea96b234fbd1de6df9da69f80fb49cfe1d22 Mon Sep 17 00:00:00 2001
From: NorseGaud <connarpierce@gmail.com>
Date: Sun, 6 Mar 2022 21:11:46 -0500
Subject: [PATCH] acme_extract -> acme_extract.py + F_BIN to avoid .py

---
 Makefile                                     | 2 +-
 target/bin/{acme_extract => acme_extract.py} | 0
 target/bin/print-environment                 | 0
 target/bin/setup                             | 0
 target/scripts/helpers/ssl.sh                | 4 ++--
 test/linting/lint.sh                         | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename target/bin/{acme_extract => acme_extract.py} (100%)
 mode change 100644 => 100755 target/bin/print-environment
 mode change 100644 => 100755 target/bin/setup

diff --git a/Makefile b/Makefile
index 2d8d2494..e8987763 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ VCS_VER = $(shell git describe --tags --contains --always)
 all: lint build backup generate-accounts tests clean
 
 build:
-	docker build --force-rm -t $(NAME) . --build-arg VCS_VER=$(VCS_VER) --build-arg VCS_REF=$(VCS_REF)
+	docker build -t $(NAME) . --build-arg VCS_VER=$(VCS_VER) --build-arg VCS_REF=$(VCS_REF)
 
 backup:
 # if backup directories exist, clean hasn't been called, therefore
diff --git a/target/bin/acme_extract b/target/bin/acme_extract.py
similarity index 100%
rename from target/bin/acme_extract
rename to target/bin/acme_extract.py
diff --git a/target/bin/print-environment b/target/bin/print-environment
old mode 100644
new mode 100755
diff --git a/target/bin/setup b/target/bin/setup
old mode 100644
new mode 100755
diff --git a/target/scripts/helpers/ssl.sh b/target/scripts/helpers/ssl.sh
index dc401e22..7731e6d8 100644
--- a/target/scripts/helpers/ssl.sh
+++ b/target/scripts/helpers/ssl.sh
@@ -418,8 +418,8 @@ function _extract_certs_from_acme
   fi
 
   local KEY CERT
-  KEY=$(acme_extract /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --key)
-  CERT=$(acme_extract /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --cert)
+  KEY=$(acme_extract.py /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --key)
+  CERT=$(acme_extract.py /etc/letsencrypt/acme.json "${CERT_DOMAIN}" --cert)
 
   if [[ -z ${KEY} ]] || [[ -z ${CERT} ]]
   then
diff --git a/test/linting/lint.sh b/test/linting/lint.sh
index b2071b30..b67e6c5f 100755
--- a/test/linting/lint.sh
+++ b/test/linting/lint.sh
@@ -99,7 +99,7 @@ function _shellcheck
     -not -path './target/docker-configomat/*'
   )"
   # shellcheck disable=SC2248
-  F_BIN="$(grep -l /bin/bash target/bin/*)"
+  F_BIN="$(find 'target/bin' -type f -not -name '*.py')"
   F_BATS="$(find 'test' -maxdepth 1 -type f -iname '*.bats')"
 
   # This command is a bit easier to grok as multi-line.