Merge pull request #1633 from rwall/patch-1

fix(dev-infra): move function before use

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

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 "${?}"

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}"

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 ":::"

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 ":::"

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 ":::"

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 ":::"

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 ":::"