From 0e78a1148cfa001e7256835efb56f26847a33fed Mon Sep 17 00:00:00 2001
From: Rob Wall <srwall@gmail.com>
Date: Sat, 1 Oct 2022 01:55:06 -0500
Subject: [PATCH] fix(dev-infra): move function before use

move err function above where it is first called
---
 scripts/backup.sh                | 8 ++++----
 scripts/pivpn                    | 8 ++++----
 scripts/uninstall.sh             | 8 ++++----
 scripts/wireguard/clientSTAT.sh  | 8 ++++----
 scripts/wireguard/disableCONF.sh | 8 ++++----
 scripts/wireguard/enableCONF.sh  | 8 ++++----
 scripts/wireguard/makeCONF.sh    | 8 ++++----
 scripts/wireguard/removeCONF.sh  | 8 ++++----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/scripts/backup.sh b/scripts/backup.sh
index f711e5b..23c2377 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -6,6 +6,10 @@ screen_size="$(stty size 2> /dev/null || echo 24 80)"
 rows="$(echo "${screen_size}" | awk '{print $1}')"
 columns="$(echo "${screen_size}" | awk '{print $2}')"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 # Divide by two so the dialogs take up half of the screen, which looks nice.
 r=$((rows / 2))
 c=$((columns / 2))
@@ -69,10 +73,6 @@ if [[ "${PLAT}" == 'Alpine' ]]; then
   CHECK_PKG_INSTALLED='apk --no-cache info -e'
 fi
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 checkbackupdir() {
   # Disabling shellcheck error $install_home sourced from $setupVars
   # shellcheck disable=SC2154
diff --git a/scripts/pivpn b/scripts/pivpn
index 875d7aa..4f3b367 100755
--- a/scripts/pivpn
+++ b/scripts/pivpn
@@ -2,6 +2,10 @@
 
 CHECK_PKG_INSTALLED='dpkg-query -s'
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if grep -qsEe "^NAME\=['\"]?Alpine[a-zA-Z ]*['\"]?$" /etc/os-release; then
   CHECK_PKG_INSTALLED='apk --no-cache info -e'
 fi
@@ -18,10 +22,6 @@ fi
 
 scriptDir="/opt/pivpn"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 uninstallServer() {
   ${SUDO} "${scriptDir}/uninstall.sh"
   exit "${?}"
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 9acec1b..af6c51f 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -26,6 +26,10 @@ setupConfigDir="/etc/pivpn"
 pivpnFilesDir="/usr/local/src/pivpn"
 pivpnScriptDir="/opt/pivpn"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 PLAT="$(grep -sEe '^NAME\=' /etc/os-release \
   | sed -E -e "s/NAME\=[\'\"]?([^ ]*).*/\1/")"
 
@@ -85,10 +89,6 @@ fi
 # shellcheck disable=SC1090
 source "${setupVars}"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 ### FIXME: introduce global lib
 spinner() {
   local pid="${1}"
diff --git a/scripts/wireguard/clientSTAT.sh b/scripts/wireguard/clientSTAT.sh
index a9a740b..f72f265 100755
--- a/scripts/wireguard/clientSTAT.sh
+++ b/scripts/wireguard/clientSTAT.sh
@@ -3,15 +3,15 @@
 
 CLIENTS_FILE="/etc/wireguard/configs/clients.txt"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if [[ ! -s "${CLIENTS_FILE}" ]]; then
   err "::: There are no clients to list"
   exit 0
 fi
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 scriptusage() {
   echo "::: List any connected clients to the server"
   echo ":::"
diff --git a/scripts/wireguard/disableCONF.sh b/scripts/wireguard/disableCONF.sh
index 0dc4f1e..8043581 100755
--- a/scripts/wireguard/disableCONF.sh
+++ b/scripts/wireguard/disableCONF.sh
@@ -2,6 +2,10 @@
 
 setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if [[ ! -f "${setupVars}" ]]; then
   err "::: Missing setup vars file!"
   exit 1
@@ -10,10 +14,6 @@ fi
 # shellcheck disable=SC1090
 source "${setupVars}"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 helpFunc() {
   echo "::: Disable client conf profiles"
   echo ":::"
diff --git a/scripts/wireguard/enableCONF.sh b/scripts/wireguard/enableCONF.sh
index 87e648c..a7176d9 100755
--- a/scripts/wireguard/enableCONF.sh
+++ b/scripts/wireguard/enableCONF.sh
@@ -2,6 +2,10 @@
 
 setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if [[ ! -f "${setupVars}" ]]; then
   err "::: Missing setup vars file!"
   exit 1
@@ -10,10 +14,6 @@ fi
 # shellcheck disable=SC1090
 source "${setupVars}"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 helpFunc() {
   echo "::: Enables client conf profiles"
   echo ":::"
diff --git a/scripts/wireguard/makeCONF.sh b/scripts/wireguard/makeCONF.sh
index 6bbc6f8..020af44 100755
--- a/scripts/wireguard/makeCONF.sh
+++ b/scripts/wireguard/makeCONF.sh
@@ -8,6 +8,10 @@ setupVars="/etc/pivpn/wireguard/setupVars.conf"
 # shellcheck disable=SC2154
 userGroup="${install_user}:${install_user}"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if [[ ! -f "${setupVars}" ]]; then
   err "::: Missing setup vars file!"
   exit 1
@@ -16,10 +20,6 @@ fi
 # shellcheck disable=SC1090
 source "${setupVars}"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 helpFunc() {
   echo "::: Create a client conf profile"
   echo ":::"
diff --git a/scripts/wireguard/removeCONF.sh b/scripts/wireguard/removeCONF.sh
index 50c2492..56572b2 100755
--- a/scripts/wireguard/removeCONF.sh
+++ b/scripts/wireguard/removeCONF.sh
@@ -2,6 +2,10 @@
 
 setupVars="/etc/pivpn/wireguard/setupVars.conf"
 
+err() {
+  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
+}
+
 if [[ ! -f "${setupVars}" ]]; then
   err "::: Missing setup vars file!"
   exit 1
@@ -10,10 +14,6 @@ fi
 # shellcheck disable=SC1090
 source "${setupVars}"
 
-err() {
-  echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')]: $*" >&2
-}
-
 helpFunc() {
   echo "::: Remove a client conf profile"
   echo ":::"