From 652d40d236219a4a314bd4944454e5641683a705 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Mon, 25 Apr 2022 10:32:59 -0400
Subject: [PATCH] Update adguard-v3.sh

---
 ct/adguard-v3.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ct/adguard-v3.sh b/ct/adguard-v3.sh
index 251e56af..3e75500a 100644
--- a/ct/adguard-v3.sh
+++ b/ct/adguard-v3.sh
@@ -1,6 +1,4 @@
-#!/usr/bin/env bash -ex
-set -euo pipefail
-shopt -s inherit_errexit nullglob
+#!/usr/bin/env bash
 
 NEXTID=$(pvesh get /cluster/nextid)
 INTEGER='^[0-9]+$'
@@ -16,6 +14,23 @@ HOLD="-"
 CM="${GN}✓${CL}"
 APP="Adguard"
 NSAPP=$(echo ${APP,,} | tr -d ' ')
+set -o errexit
+set -o errtrace
+set -o nounset
+set -o pipefail
+shopt -s expand_aliases
+alias die='EXIT=$? LINE=$LINENO error_exit'
+trap die ERR
+
+function error_exit() {
+  trap - ERR
+  local reason="Unknown failure occured."
+  local msg="${1:-$reason}"
+  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
+  echo -e "$flag $msg" 1>&2
+  exit $EXIT
+}
+
 while true; do
     read -p "This will create a New ${APP} LXC. Proceed(y/n)?" yn
     case $yn in