Forráskód Böngészése

more pruning & code refactoring (#1011)

* improve error handling to show more details

* improve the way it checks for root password

* consistant getty_override

* streamline verbose mode

* remove v4 scripts

* small tweaks
tteckster 2 éve
szülő
commit
c8aa5a029d
100 módosított fájl, 448 hozzáadás és 15583 törlés
  1. 0 329
      ct/adguard-v4.sh
  2. 8 17
      ct/adguard-v5.sh
  3. 8 17
      ct/alpine-v5.sh
  4. 8 17
      ct/archlinux-v5.sh
  5. 8 17
      ct/audiobookshelf-v5.sh
  6. 8 17
      ct/autobrr-v5.sh
  7. 0 327
      ct/blocky-v4.sh
  8. 8 17
      ct/blocky-v5.sh
  9. 0 344
      ct/casaos-v4.sh
  10. 8 17
      ct/casaos-v5.sh
  11. 0 329
      ct/changedetection-v4.sh
  12. 8 17
      ct/changedetection-v5.sh
  13. 8 15
      ct/create_lxc.sh
  14. 8 17
      ct/cronicle-v5.sh
  15. 0 329
      ct/daemonsync-v4.sh
  16. 8 17
      ct/daemonsync-v5.sh
  17. 0 329
      ct/dashy-v4.sh
  18. 8 17
      ct/dashy-v5.sh
  19. 0 326
      ct/debian-v4.sh
  20. 8 17
      ct/debian-v5.sh
  21. 0 343
      ct/deconz-v4.sh
  22. 8 16
      ct/deconz-v5.sh
  23. 8 17
      ct/deluge-v5.sh
  24. 0 353
      ct/docker-v4.sh
  25. 8 17
      ct/docker-v5.sh
  26. 0 350
      ct/emby-v4.sh
  27. 8 17
      ct/emby-v5.sh
  28. 0 329
      ct/emqx-v4.sh
  29. 8 17
      ct/emqx-v5.sh
  30. 0 328
      ct/esphome-v4.sh
  31. 8 17
      ct/esphome-v5.sh
  32. 0 328
      ct/grafana-v4.sh
  33. 8 17
      ct/grafana-v5.sh
  34. 0 328
      ct/grocy-v4.sh
  35. 8 17
      ct/grocy-v5.sh
  36. 0 328
      ct/heimdalldashboard-v4.sh
  37. 8 17
      ct/heimdalldashboard-v5.sh
  38. 0 343
      ct/homeassistant-core-v4.sh
  39. 8 18
      ct/homeassistant-core-v5.sh
  40. 0 357
      ct/homeassistant-v4.sh
  41. 8 17
      ct/homeassistant-v5.sh
  42. 0 328
      ct/homebridge-v4.sh
  43. 8 17
      ct/homebridge-v5.sh
  44. 0 329
      ct/homepage-v4.sh
  45. 8 17
      ct/homepage-v5.sh
  46. 8 17
      ct/homer-v5.sh
  47. 0 344
      ct/hyperion-v4.sh
  48. 8 17
      ct/hyperion-v5.sh
  49. 0 326
      ct/influxdb-v4.sh
  50. 8 17
      ct/influxdb-v5.sh
  51. 0 328
      ct/iobroker-v4.sh
  52. 8 17
      ct/iobroker-v5.sh
  53. 0 350
      ct/jellyfin-v4.sh
  54. 8 17
      ct/jellyfin-v5.sh
  55. 8 17
      ct/k0s-v5.sh
  56. 8 17
      ct/kavita-v5.sh
  57. 0 329
      ct/keycloak-v4.sh
  58. 8 17
      ct/keycloak-v5.sh
  59. 8 17
      ct/lidarr-v5.sh
  60. 0 329
      ct/magicmirror-v4.sh
  61. 8 17
      ct/magicmirror-v5.sh
  62. 0 326
      ct/mariadb-v4.sh
  63. 8 17
      ct/mariadb-v5.sh
  64. 0 328
      ct/meshcentral-v4.sh
  65. 8 17
      ct/meshcentral-v5.sh
  66. 0 328
      ct/motioneye-v4.sh
  67. 8 17
      ct/motioneye-v5.sh
  68. 0 293
      ct/mqtt-v4.sh
  69. 8 17
      ct/mqtt-v5.sh
  70. 0 329
      ct/n8n-v4.sh
  71. 8 17
      ct/n8n-v5.sh
  72. 0 328
      ct/navidrome-v4.sh
  73. 8 17
      ct/navidrome-v5.sh
  74. 0 329
      ct/nextcloudpi-v4.sh
  75. 8 17
      ct/nextcloudpi-v5.sh
  76. 0 329
      ct/nginx-proxy-manager-v4.sh
  77. 8 17
      ct/nginxproxymanager-v5.sh
  78. 0 328
      ct/nocodb-v4.sh
  79. 8 17
      ct/nocodb-v5.sh
  80. 0 328
      ct/node-red-v4.sh
  81. 8 17
      ct/node-red-v5.sh
  82. 0 337
      ct/omada-v4.sh
  83. 8 17
      ct/omada-v5.sh
  84. 0 339
      ct/omv-v4.sh
  85. 8 17
      ct/omv-v5.sh
  86. 0 329
      ct/openhab-v4.sh
  87. 8 17
      ct/openhab-v5.sh
  88. 0 329
      ct/paperless-ngx-v4.sh
  89. 8 17
      ct/paperless-ngx-v5.sh
  90. 0 331
      ct/photoprism-v4.sh
  91. 8 17
      ct/photoprism-v5.sh
  92. 0 328
      ct/pihole-v4.sh
  93. 8 17
      ct/pihole-v5.sh
  94. 0 350
      ct/plex-v4.sh
  95. 8 17
      ct/plex-v5.sh
  96. 0 354
      ct/podman-homeassistant-v4.sh
  97. 8 17
      ct/podman-homeassistant-v5.sh
  98. 8 17
      ct/podman-v5.sh
  99. 0 327
      ct/postgresql-v4.sh
  100. 8 17
      ct/postgresql-v5.sh

+ 0 - 329
ct/adguard-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Adguard"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${GN}
-    ___       __                           __
-   /   | ____/ /___ ___  ______ __________/ /
-  / /| |/ __  / __  / / / / __  / ___/ __  / 
- / ___ / /_/ / /_/ / /_/ / /_/ / /  / /_/ /  
-/_/v4|_\__,_/\__, /\__,_/\__,_/_/   \__,_/   
-            /____/                           
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}http://${IP}:3000${CL} \n"

+ 8 - 17
ct/adguard-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -141,7 +135,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -316,7 +309,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -380,7 +372,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/alpine-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -314,7 +307,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -359,7 +351,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/archlinux-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/audiobookshelf-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -138,7 +132,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -313,7 +306,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -358,7 +350,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/autobrr-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -141,7 +135,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -316,7 +309,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -372,7 +364,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 327
ct/blocky-v4.sh

@@ -1,327 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Blocky"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    ____  __           __        
-   / __ )/ /___v4_____/ /____  __
-  / __  / / __ \/ ___/ //_/ / / /
- / /_/ / / /_/ / /__/ ,< / /_/ / 
-/_____/_/\____/\___/_/|_|\__, /  
-                        /____/   
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/blocky-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 344
ct/casaos-v4.sh

@@ -1,344 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="CasaOS"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-   ______                 ____  _____
-  / ____/___ __v4______ _/ __ \/ ___/
- / /   / __ `/ ___/ __ `/ / / /\__ \ 
-/ /___/ /_/ (__  ) /_/ / /_/ /___/ / 
-\____/\__,_/____/\__,_/\____//____/  
-                                     
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-  FUSE="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$FUSE" == "yes" ]; then 
-FEATURES="fuse=1,keyctl=1,nesting=1"
-else
-FEATURES="keyctl=1,nesting=1" 
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export ST=$FUSE
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-EOF
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}http://${IP} ${CL} \n"

+ 8 - 17
ct/casaos-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -144,7 +138,6 @@ function default_settings() {
   FUSE="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -326,7 +319,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -373,7 +365,6 @@ pushd $TEMP_DIR >/dev/null
 export ST=$FUSE
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/changedetection-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Change Detection"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-   ________                              ____       __            __  _           
-  / ____/ /_v4____ _____  ____ ____     / __ \___  / /____  _____/ /_(_)___  ____ 
- / /   / __ \/ __ `/ __ \/ __ `/ _ \   / / / / _ \/ __/ _ \/ ___/ __/ / __ \/ __ \
-/ /___/ / / / /_/ / / / / /_/ /  __/  / /_/ /  __/ /_/  __/ /__/ /_/ / /_/ / / / /
-\____/_/ /_/\__,_/_/ /_/\__, /\___/  /_____/\___/\__/\___/\___/\__/_/\____/_/ /_/ 
-                       /____/                                                     
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:5000${CL} \n"

+ 8 - 17
ct/changedetection-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -362,7 +354,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 15
ct/create_lxc.sh

@@ -36,21 +36,14 @@ if [ -z "$VALIDTMP" ]; then
   exit 1
 fi
 
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function select_storage() {

+ 8 - 17
ct/cronicle-v5.sh

@@ -33,20 +33,14 @@ HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
 hostname="$(hostname)"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -140,7 +134,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -315,7 +308,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -410,7 +402,6 @@ pushd $TEMP_DIR >/dev/null
 export SERV=$SERVER
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/daemonsync-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Daemon Sync"
-var_disk="8"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    ____                                      _____                 
-   / __ \____ ____  ____ ___  ____  ____     / ___/__  ______  _____
-  / / / / __  / _ \/ __  __ \/ __ \/ __ \    \__ \/ / / / __ \/ ___/
- / /_/ / /_/ /  __/ / / / / / /_/ / / / /   ___/ / /_/ / / / / /__  
-/_____/\__,_/\___/_/ /_/ /_/\____/_/ /_/ v4/____/\__, /_/ /_/\___/  
-                                                /____/              
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8084${CL} \n"

+ 8 - 17
ct/daemonsync-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/dashy-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Dashy"
-var_disk="3"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    ____             __         
-   / __ \____ ______/ /_  __  __
-  / / / / __  / ___/ __ \/ / / /
- / /_/ / /_/ (__  ) / / / /_/ / 
-/_____/\__,_/____/_/ /_/\__, /  
-                   v4  /____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:4000${CL} \n"

+ 8 - 17
ct/dashy-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -389,7 +381,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 326
ct/debian-v4.sh

@@ -1,326 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Debian"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    ____  __________  _______    _   __
-   / __ \/ ____/ __ )/  _/   |  / | / /
-  / / / / __/ / __  |/ // /| | /  |/ / 
- / /_/ / /_v4/ /_/ // // ___ |/ /|  /  
-/_____/_____/_____/___/_/  |_/_/ |_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} ${var_version} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/debian-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -138,7 +132,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -313,7 +306,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -358,7 +350,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 343
ct/deconz-v4.sh

@@ -1,343 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="deCONZ"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-       __     __________  _   _______
-  ____/ /v4  / ____/ __ \/ | / /__  /
- / __  / _ \/ /   / / / /  |/ /  / / 
-/ /_/ /  __/ /___/ /_/ / /|  /  / /__
-\__,_/\___/\____/\____/_/ |_/  /____/
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-  cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-             ${BL}http://${IP}${CL}\n"

+ 8 - 16
ct/deconz-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -317,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +356,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/deluge-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -139,7 +133,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -314,7 +307,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -359,7 +351,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 353
ct/docker-v4.sh

@@ -1,353 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Docker"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    ____             __            
-   / __ \____  _____/ /_v4__  _____
-  / / / / __ \/ ___/ //_/ _ \/ ___/
- / /_/ / /_/ / /__/ ,< /  __/ /    
-/_____/\____/\___/_/|_|\___/_/     
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-  FUSE="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$FUSE" == "yes" ]; then 
-FEATURES="fuse=1,keyctl=1,nesting=1"
-else
-FEATURES="keyctl=1,nesting=1" 
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export ST=$FUSE
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-EOF
-if [ "$CT_TYPE" == "0" ]; then
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/docker-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   FUSE="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -325,7 +318,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -370,7 +362,6 @@ pushd $TEMP_DIR >/dev/null
 export ST=$FUSE
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 350
ct/emby-v4.sh

@@ -1,350 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Emby"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${DGN}
-    ______          __         
-   / ____/___ v4_  / /_  __  __
-  / __/ / __  __ \/ __ \/ / / /
- / /___/ / / / / / /_/ / /_/ / 
-/_____/_/ /_/ /_/_.___/\__, /  
-                      /____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-    "18.04" "Bionic" OFF \
-    "20.04" "Focal" ON \
-    "22.04" "Jammy" OFF \
-    "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 226:0 rwm
-lxc.cgroup2.devices.allow: c 226:128 rwm
-lxc.cgroup2.devices.allow: c 29:0 rwm
-lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file
-lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir
-lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-             ${BL}http://${IP}:8096${CL}\n"

+ 8 - 17
ct/emby-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -326,7 +319,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -382,7 +374,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/emqx-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="EMQX"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    ________  _______v4 _  __
-   / ____/  |/  / __ \ | |/ /
-  / __/ / /|_/ / / / / |   / 
- / /___/ /  / / /_/ / /   |  
-/_____/_/  /_/\___\_\/_/|_|  
-                             
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}http://${IP}:18083${CL} \n"

+ 8 - 17
ct/emqx-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -362,7 +354,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/esphome-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="ESPHome"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${CL}
-    ___________ ____  __  ______  __  _________
-   / ____/ ___// __ \/ / / / __ \/  |/  / ____/
-  / __/  \__ \/ /_/ / /_/ / / / / /|_/ / __/   
- / /___ ___/ / ____/ __  / /_/ / /  / / /_v4   
-/_____//____/_/   /_/ /_/\____/_/  /_/_____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:6052${CL} \n"

+ 8 - 17
ct/esphome-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -369,7 +361,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/grafana-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Grafana"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-   ______           ____                 
-  / ____/________ _/ __/___ _____  ____ _
- / / __/ ___/ __  / /_/ __  / __ \/ __  /
-/ /_/ / /  / /_/ / __/ /_/ / / / / /_/ / 
-\____/_/ v4\__,_/_/  \__,_/_/ /_/\__,_/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:3000${CL} \n"

+ 8 - 17
ct/grafana-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/grocy-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="grocy"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-   ____ __________  _______  __
-  / __  / ___/ __ \/ ___/ / / /
- / /_/ / /  / /_/ / /__/ /_/ / 
- \__, /_/   \____/\___/\__, /  
-/____/      v4        /____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}${CL} \n"

+ 8 - 17
ct/grocy-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -362,7 +354,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/heimdalldashboard-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Heimdall Dashboard"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  __     _               __      ____   ____             __    __                         __
-   / / / /__  (_)___ ___  ____/ /_v4 _/ / /  / __ \____ ______/ /_  / /_  ____  ____ __________/ /
-  / /_/ / _ \/ / __  __ \/ __  / __  / / /  / / / / __  / ___/ __ \/ __ \/ __ \/ __  / ___/ __  / 
- / __  /  __/ / / / / / / /_/ / /_/ / / /  / /_/ / /_/ (__  ) / / / /_/ / /_/ / /_/ / /  / /_/ /  
-/_/ /_/\___/_/_/ /_/ /_/\__,_/\__,_/_/_/  /_____/\__,_/____/_/ /_/_.___/\____/\__,_/_/   \__,_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:7990${CL} \n"

+ 8 - 17
ct/heimdalldashboard-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -442,7 +434,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 343
ct/homeassistant-core-v4.sh

@@ -1,343 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Home Assistant-Core"
-var_disk="8"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-                                _           _     _              _       ___               
-  /\  /\___  _ __ ___   ___    /_\  ___ ___(_)___| |_ __ _ _ __ | |_    / __\___v4_ __ ___ 
- / /_/ / _ \| '_ ` _ \ / _ \  //_\\/ __/ __| / __| __/ _` | '_ \| __|  / /  / _ \| '__/ _ \
-/ __  / (_) | | | | | |  __/ /  _  \__ \__ \ \__ \ || (_| | | | | |_  / /__| (_) | | |  __/
-\/ /_/ \___/|_| |_| |_|\___| \_/ \_/___/___/_|___/\__\__,_|_| |_|\__| \____/\___/|_|  \___|
-                                                                                           
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-  cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable (after it's initialized) by going to the following URL.
-         ${BL}http://${IP}:8123${CL}"

+ 8 - 18
ct/homeassistant-core-v5.sh

@@ -34,21 +34,14 @@ CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
 STABLE=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/stable.json | grep "default" | awk '{print substr($2, 2, length($2)-3) }')
 BETA=$(curl -s https://raw.githubusercontent.com/home-assistant/version/master/beta.json | grep "default" | awk '{print substr($2, 2, length($2)-3) }')
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -144,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
@@ -320,7 +312,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -438,7 +429,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 357
ct/homeassistant-v4.sh

@@ -1,357 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Home Assistant"
-var_disk="16"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  __                        ___              _      __              __ 
-   / / / /___  ____ ___  ___ v4  /   |  __________(_)____/ /_____ _____  / /_
-  / /_/ / __ \/ __  __ \/ _ \   / /| | / ___/ ___/ / ___/ __/ __  / __ \/ __/
- / __  / /_/ / / / / / /  __/  / ___ |(__  |__  ) (__  ) /_/ /_/ / / / / /_  
-/_/ /_/\____/_/ /_/ /_/\___/  /_/  |_/____/____/_/____/\__/\__,_/_/ /_/\__/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-  FUSE="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
-      FUSE="yes"
-  else
-      echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
-      FUSE="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$FUSE" == "yes" ]; then 
-FEATURES="fuse=1,keyctl=1,nesting=1"
-else
-FEATURES="keyctl=1,nesting=1" 
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export ST=$FUSE
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-EOF
-if [ "$CT_TYPE" == "0" ]; then
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8123${CL}
-Portainer should be reachable by going to the following URL.
-         ${BL}http://${IP}:9000${CL}\n"

+ 8 - 17
ct/homeassistant-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -145,7 +139,6 @@ function default_settings() {
   FUSE="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 
@@ -328,7 +321,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -438,7 +430,6 @@ pushd $TEMP_DIR >/dev/null
 export ST=$FUSE
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/homebridge-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Homebridge"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-    __  ______  __  _____________  ____  ________  ____________
-   / / / / __ \/  |/  / ____/ __ )/ __ \/  _/ __ \/ ____/ ____/
-  / /_/ / / / / /|_/ / __/ / __  / /_/ // // / / / / __/ __/   
- / __  / /_/ / /  / / /___/ /_/ / _, _// // /_/ / /_/ / /___   
-/_/ /_/\____/_/v4/_/_____/_____/_/ |_/___/_____/\____/_____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8581${CL} \n"

+ 8 - 17
ct/homebridge-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/homepage-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Homepage"
-var_disk="3"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    __  __                                          
-   / / / /___  ____ ___  ___  ____  ____ _____ ____ 
-  / /_/ / __ \/ __ `__ \/ _ \/ __ \/ __ `/ __ `/ _ \
- / __  / /_/ / / / / / /  __/ /_/ / /_/ / /_/ /  __/
-/_/ /_/\____/_/ /_/ /_/\___/ .___/\__,_/\__, /\___/ 
-                          /_/   v4     /____/       
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}http://${IP}:3000${CL} \n"

+ 8 - 17
ct/homepage-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -369,7 +361,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/homer-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -138,7 +132,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -313,7 +306,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -382,7 +374,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 344
ct/hyperion-v4.sh

@@ -1,344 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Hyperion"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-cat <<"EOF"
-    __  __                      _           
-   / / / /_  ______v4___  _____(_)___  ____ 
-  / /_/ / / / / __ \/ _ \/ ___/ / __ \/ __ \
- / __  / /_/ / /_/ /  __/ /  / / /_/ / / / /
-/_/ /_/\__, / .___/\___/_/  /_/\____/_/ /_/ 
-      /____/_/                              
-
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD (leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-  cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8090${CL} \n"

+ 8 - 17
ct/hyperion-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -364,7 +356,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 326
ct/influxdb-v4.sh

@@ -1,326 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="InfluxDB"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-    ____      ______           ____  ____ 
-   /  _/_v4  / __/ /_  ___  __/ __ \/ __ )
-   / // __ \/ /_/ / / / / |/_/ / / / __  |
- _/ // / / / __/ / /_/ />  </ /_/ / /_/ / 
-/___/_/ /_/_/ /_/\__,_/_/|_/_____/_____/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/influxdb-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/iobroker-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="ioBroker"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    _       ____             __            
-   (_)___  / __ )_________  / /_____  _____
-  / / __ \/ __  / ___/ __ \/ //_/ _ \/ ___/
- / / /_/ / /_/ / /  / /_/ / ,< /  __/ /    
-/_/\____/_____/_/ v4\____/_/|_|\___/_/     
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8081${CL} \n"

+ 8 - 17
ct/iobroker-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 350
ct/jellyfin-v4.sh

@@ -1,350 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Jellyfin"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${DGN}
-       __________    ____  _____________   __
-      / / ____/ /   / /\ \/ / ____/  _/ | / /
- __  / / __/ / /   / /  \  / /_   / //  |/ / 
-/ /_/ / /___/ /___/ /_v4/ / __/ _/ // /|  /  
-\____/_____/_____/_____/_/_/   /___/_/ |_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
-    "18.04" "Bionic" OFF \
-    "20.04" "Focal" ON \
-    "22.04" "Jammy" OFF \
-    "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 226:0 rwm
-lxc.cgroup2.devices.allow: c 226:128 rwm
-lxc.cgroup2.devices.allow: c 29:0 rwm
-lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file
-lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir
-lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-             ${BL}http://${IP}:8096${CL}\n"

+ 8 - 17
ct/jellyfin-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -145,7 +139,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -328,7 +321,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -372,7 +364,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/k0s-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/kavita-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -141,7 +135,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -316,7 +309,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -361,7 +353,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/keycloak-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Keycloak"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    __ __                __            __  
-   / //_/__  __  _______/ /___  ____ _/ /__
-  / ,< / _ \/ / / / ___/ / __ \/ __  / //_/
- / /| /  __/ /_/ / /__/ / /_/ / /_/ / ,<   
-/_/ |_\___/\__, /\___/_/\____/\__,_/_/|_|  
-     v4   /____/                           
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8080${CL} \n"

+ 8 - 17
ct/keycloak-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -364,7 +356,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/lidarr-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -138,7 +132,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -313,7 +306,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -358,7 +350,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/magicmirror-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="MagicMirror"
-var_disk="3"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  ___            _      __  ____                     
-   /  |/  /___ _____ _(_)____/  |/  (_)_____________  _____
-  / /|_/ / __  / __  / / ___/ /|_/ / / ___/ ___/ __ \/ ___/
- / /  / / /_/ / /_/ / / /__/ /  / / / /  / /  / /_/ / /    
-/_/  /_/\__,_/\__, /_/\___/_/  /_/_/_/  /_/   \____/_/     
-             /____/   v4                                   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8080${CL} \n"

+ 8 - 17
ct/magicmirror-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -365,7 +357,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 326
ct/mariadb-v4.sh

@@ -1,326 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="MariaDB"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  ___           _       ____  ____ 
-   /  |/  /___ ______(_)___ _/ __ \/ __ )
-  / /|_/ / __  / ___/ / __  / / / / __  |
- / /  / / /_/ / /  / / /_/ / /_/ / /_/ / 
-/_/  /_/\__,_/_/v4/_/\__,_/_____/_____/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/mariadb-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/meshcentral-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="MeshCentral"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  ___          __    ______           __             __
-   /  |/  /__  _____/ /_  / ____/__  ____  / /__________ _/ /
-  / /|_/ / _ \/ ___/ __ \/ /   / _ \/ __ \/ __/ ___/ __  / / 
- / /  / /  __(__  ) / / / /___/  __/ / / / /_/ /  / /_/ / /  
-/_/  /_/\___/____/_/ /_/\____/\___/_/ /_/\__/_/ v4\__,_/_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}${CL} \n"

+ 8 - 17
ct/meshcentral-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/motioneye-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Motioneye"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    __  ___      __  _             ________  ________
-   /  |/  /___  / /_(_)___  ____  / ____/\ \/ / ____/
-  / /|_/ / __ \/ __/ / __ \/ __ \/ __/    \  / __/   
- / /  / / /_/ / /_/ / /_/ / / / / /___v4  / / /___   
-/_/  /_/\____/\__/_/\____/_/ /_/_____/   /_/_____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8765${CL} \n"

+ 8 - 17
ct/motioneye-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -362,7 +354,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 293
ct/mqtt-v4.sh

@@ -1,293 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="MQTT"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=`echo "\033[33m"`
-BL=`echo "\033[36m"`
-RD=`echo "\033[01;31m"`
-BGN=`echo "\033[4;92m"`
-GN=`echo "\033[1;92m"`
-DGN=`echo "\033[32m"`
-CL=`echo "\033[m"`
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-    echo "User selected Yes"
-else
-    clear
-    echo -e "⚠ User exited script \n"
-    exit
-fi
-function header_info {
-echo -e "${GN}
-    __  _______  ____________
-   /  |/  / __ \/_  __/_  __/
-  / /|_/ / / / / / /   / /   
- / /  / / /_/ / / /   / /    
-/_/  /_/\___\_\/_/ v4/_/     
-${CL}"
-}
-function msg_info() {
-    local msg="$1"
-    echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-    local msg="$1"
-    echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-    PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-if [[ $PVE != 1 ]]; then
-   echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-   echo -e "Exiting..."
-   sleep 2
-   exit
-fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-  echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-"1" "Unprivileged" ON \
-"0" "Privileged" OFF \
-3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-fi
-PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58  --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ $exitstatus = 0 ]; then
-  if [ -z $PW1 ]; then PW1="Automatic Login" PW=" ";
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-else
-    PW="-password $PW1"
-    echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-  fi
-fi
-CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $CT_ID ]; then CT_ID="$NEXTID"; echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi;
-fi
-CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $CT_NAME ]; then HN="$NSAPP"; echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}";
-else
-  if [ $exitstatus = 0 ]; then HN=$(echo ${CT_NAME,,} | tr -d ' '); echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"; fi;
-fi
-DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $DISK_SIZE ]; then DISK_SIZE="$var_disk"; echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi;
-    if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"; advanced_settings; fi;
-fi
-CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $CORE_COUNT ]; then CORE_COUNT="$var_cpu"; echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi;
-fi
-RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $RAM_SIZE ]; then RAM_SIZE="$var_ram"; echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi;
-fi
-BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $BRG ]; then BRG="vmbr0"; echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi;
-fi
-NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ -z $NET ]; then NET="dhcp"; echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}";
-else
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi;
-fi
-GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58  --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ $exitstatus = 0 ]; then
-  if [ -z $GATE1 ]; then GATE1="Default" GATE="";
-    echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-else
-    GATE=",gw=$GATE1"
-    echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-  fi
-fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58  --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ $exitstatus = 0 ]; then
-  if [ -z $MAC1 ]; then MAC1="Default" MAC="";
-    echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-else
-    MAC=",hwaddr=$MAC1"
-    echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-  fi
-fi
-VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58  --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-exitstatus=$?
-if [ $exitstatus = 0 ]; then
-  if [ -z $VLAN1 ]; then VLAN1="Default" VLAN="";
-    echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-else
-    VLAN=",tag=$VLAN1"
-    echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-  fi  
-fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-else
-  clear
-  header_info
-  echo -e "${RD}Using Advanced Settings${CL}"
-  advanced_settings
-fi
-}
-function start_script() {
-if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-  header_info
-  echo -e "${BL}Using Default Settings${CL}"
-  default_settings
-else
-  header_info
-  echo -e "${RD}Using Advanced Settings${CL}"
-  advanced_settings
-fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/mqtt-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -140,7 +134,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -315,7 +308,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/n8n-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="n8n"
-var_disk="3"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-         ___        
-        / _ \       
-  _ __ | (_) |_v4_  
- |  _ \ > _ <|  _ \ 
- | | | | (_) | | | |
- |_| |_|\___/|_| |_|
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:5678${CL} \n"

+ 8 - 17
ct/n8n-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/navidrome-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Navidrome"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    _   __            _     __                        
-   / | / /___ __ v4__(_)___/ /________  ____ ___  ___ 
-  /  |/ / __  / | / / / __  / ___/ __ \/ __  __ \/ _ \
- / /|  / /_/ /| |/ / / /_/ / /  / /_/ / / / / / /  __/
-/_/ |_/\__,_/ |___/_/\__,_/_/   \____/_/ /_/ /_/\___/ 
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:4533${CL} \n"

+ 8 - 17
ct/navidrome-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -374,7 +366,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/nextcloudpi-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="NextCloudPi"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    _   __          __  ________                ______  _ 
-   / | / /__  _  __/ /_/ ____/ /___  __v4______/ / __ \(_)
-  /  |/ / _ \| |/_/ __/ /   / / __ \/ / / / __  / /_/ / / 
- / /|  /  __/>  </ /_/ /___/ / /_/ / /_/ / /_/ / ____/ /  
-/_/ |_/\___/_/|_|\__/\____/_/\____/\__,_/\__,_/_/   /_/   
-                                                          
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} Setup should be reachable by going to the following URL.
-         ${BL}https://${IP}/${CL} \n"

+ 8 - 17
ct/nextcloudpi-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/nginx-proxy-manager-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Nginx Proxy Manager"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    _   __      _               ____                           __  ___                                 
-   / | / /___ _(_)___  _  __   / __ \_________  _  ____  __   /  |/  /___ _____  ____ _____ ____  _____
-  /  |/ / __  / / __ \| |/_/  / /_/ / ___/ __ \| |/_/ / / /  / /|_/ / __  / __ \/ __  / __  / _ \/ ___/
- / /|  / /_/ / / / / />  <   / ____/ /  / /_/ />  </ /_/ /  / /  / / /_/ / / / / /_/ / /_/ /  __/ /    
-/_/ |_/\__, /_/_/ /_/_/|_|  /_/   /_/   \____/_/|_|\__, /  /_/  /_/\__,_/_/ /_/\__,_/\__, /\___/_/     
-      /____/                         v4           /____/                            /____/             
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/nginx-proxy-manager-install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:81${CL} \n"

+ 8 - 17
ct/nginxproxymanager-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -472,7 +464,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/nocodb-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="NocoDB"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-    _   __                 ____  ____ 
-   / | / /___  ____v4___  / __ \/ __ )
-  /  |/ / __ \/ ___/ __ \/ / / / __  |
- / /|  / /_/ / /__/ /_/ / /_/ / /_/ / 
-/_/ |_/\____/\___/\____/_____/_____/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8080/dashboard${CL} \n"

+ 8 - 17
ct/nocodb-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -366,7 +358,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/node-red-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Node-Red"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    _   __          __        ____           __
-   / | / /___  ____/ /__ v4  / __ \___  ____/ /
-  /  |/ / __ \/ __  / _ \   / /_/ / _ \/ __  / 
- / /|  / /_/ / /_/ /  __/  / _, _/  __/ /_/ /  
-/_/ |_/\____/\__,_/\___/  /_/ |_|\___/\__,_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:1880${CL} \n"

+ 8 - 17
ct/node-red-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -399,7 +391,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 337
ct/omada-v4.sh

@@ -1,337 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Omada"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-   ____                      __     
-  / __ \____ ___v4____ _____/ /___ _
- / / / / __  __ \/ __  / __  / __  /
-/ /_/ / / / / / / /_/ / /_/ / /_/ / 
-\____/_/ /_/ /_/\__,_/\__,_/\__,_/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
-    "18.04" "Bionic" OFF \
-    "20.04" "Focal" ON \
-    "22.04" "Jammy" OFF \
-    "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}https://${IP}:8043${CL} \n"

+ 8 - 17
ct/omada-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -326,7 +319,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -361,7 +353,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 339
ct/omv-v4.sh

@@ -1,339 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="OMV"
-var_disk="4"
-var_cpu="2"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-   ____                   __  ___         ___      _    __            ____ 
-  / __ \____v4___  ____  /  |/  /__  ____/ (_)___ | |  / /___ ___  __/ / /_
- / / / / __ \/ _ \/ __ \/ /|_/ / _ \/ __  / / __ `/ | / / __ `/ / / / / __/
-/ /_/ / /_/ /  __/ / / / /  / /  __/ /_/ / / /_/ /| |/ / /_/ / /_/ / / /_  
-\____/ .___/\___/_/ /_/_/  /_/\___/\__,_/_/\__,_/ |___/\__,_/\__,_/_/\__/  
-    /_/                                                                    
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop: 
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-EOF
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}${CL} \n"

+ 8 - 17
ct/omv-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -364,7 +356,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/openhab-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="openHAB"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-                          __  _____    ____ 
-  ____v4____  ___  ____  / / / /   |  / __ )
- / __ \/ __ \/ _ \/ __ \/ /_/ / /| | / __  |
-/ /_/ / /_/ /  __/ / / / __  / ___ |/ /_/ / 
-\____/ .___/\___/_/ /_/_/ /_/_/  |_/_____/  
-    /_/                                     
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8080${CL} \n"

+ 8 - 17
ct/openhab-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -364,7 +356,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 329
ct/paperless-ngx-v4.sh

@@ -1,329 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Paperless-ngx"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  cat <<"EOF"
-    ____                        __                                     
-   / __ \____ _____  ___  _____/ /__v4__________    ____  ____ __  __
-  / /_/ / __ `/ __ \/ _ \/ ___/ / _ \/ ___/ ___/___/ __ \/ __ `/ |/_/
- / ____/ /_/ / /_/ /  __/ /  / /  __(__  |__  )___/ / / / /_/ />  <  
-/_/    \__,_/ .___/\___/_/  /_/\___/____/____/   /_/ /_/\__, /_/|_|  
-           /_/                                         /____/        
-EOF
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8000${CL} \n"

+ 8 - 17
ct/paperless-ngx-v5.sh

@@ -33,20 +33,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -143,7 +137,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -318,7 +311,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -431,7 +423,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 331
ct/photoprism-v4.sh

@@ -1,331 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="PhotoPrism"
-var_disk="8"
-var_cpu="2"
-var_ram="3072"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    ____  __  ______  __________  ____  ____  _________ __  ___
-   / __ \/ / / / __ \/_  __/ __ \/ __ \/ __ \/  _/ ___//  |/  /
-  / /_/ / /_/ / / / / / / / / / / /_/ / /_/ // / \__ \/ /|_/ / 
- / ____/ __  / /_/ / / / / /_/ / ____/ _, _// / v4_/ / /  / /  
-/_/   /_/ /_/\____/ /_/  \____/_/   /_/ |_/___//____/_/  /_/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_info "Setting Container to Normal Resources"
-pct set $CTID -memory 2048
-msg_ok "Set Container to Normal Resources"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:2342${CL} \n"

+ 8 - 17
ct/photoprism-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -141,7 +135,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -316,7 +309,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -384,7 +376,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 328
ct/pihole-v4.sh

@@ -1,328 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Pihole"
-var_disk="2"
-var_cpu="1"
-var_ram="512"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${RD}
-    ____  ____   __  ______  __    ______
-   / __ \/  _/  / / / / __ \/ /   / ____/
-  / /_/ // /___/ /_/ / / / / /   / __/   
- / ____// /___/ __  / /_/ / /v4_/ /___   
-/_/   /___/  /_/ /_/\____/_____/_____/   
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}/admin${CL} \n"

+ 8 - 17
ct/pihole-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 350
ct/plex-v4.sh

@@ -1,350 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Plex"
-var_disk="8"
-var_cpu="2"
-var_ram="2048"
-var_os="ubuntu"
-var_version="20.04"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${YW}
-    ____  __         
-   / __ \/ /__  _  __
-  / /_/ / / _ \| |/_/
- / ____/ /  __/>  <  
-/_/v4 /_/\___/_/|_|  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using ${var_os} Version: ${BGN}${var_version}${CL}"
-
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  var_version=$(whiptail --title "UBUNTU VERSION" --radiolist "Choose Version" 11 58 4 \
-    "18.04" "Bionic" OFF \
-    "20.04" "Focal" ON \
-    "22.04" "Jammy" OFF \
-    "22.10" "Kinetic" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Ubuntu Version: ${BGN}$var_version${CL}"; fi
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" OFF \
-    "0" "Privileged" ON \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-if [ "$CT_TYPE" == "0" ]; then
-  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: c 226:0 rwm
-lxc.cgroup2.devices.allow: c 226:128 rwm
-lxc.cgroup2.devices.allow: c 29:0 rwm
-lxc.mount.entry: /dev/fb0 dev/fb0 none bind,optional,create=file
-lxc.mount.entry: /dev/dri dev/dri none bind,optional,create=dir
-lxc.mount.entry: /dev/dri/renderD128 dev/dri/renderD128 none bind,optional,create=file
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-             ${BL}http://${IP}:32400/web${CL}\n"

+ 8 - 17
ct/plex-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -144,7 +138,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -327,7 +320,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -382,7 +374,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 354
ct/podman-homeassistant-v4.sh

@@ -1,354 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="Podman-Home Assistant"
-var_disk="16"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-                     ____            __                                      
-                    / __ \____  ____/ /___ ___  ____ _____                   
-           v4      / /_/ / __ \/ __  / __  __ \/ __  / __ \                  
-                  / ____/ /_/ / /_/ / / / / / / /_/ / / / /                  
-    __  __       /_/    \____/\__,_/_/ /_/ /_/\__,_/_/ /_/__              __ 
-   / / / /___  ____ ___  ___     /   |  __________(_)____/ /_____ _____  / /_
-  / /_/ / __ \/ __  __ \/ _ \   / /| | / ___/ ___/ / ___/ __/ __  / __ \/ __/
- / __  / /_/ / / / / / /  __/  / ___ |(__  |__  ) (__  ) /_/ /_/ / / / / /_  
-/_/ /_/\____/_/ /_/ /_/\___/  /_/  |_/____/____/_/____/\__/\__,_/_/ /_/\__/  
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Privileged${CL}"
-  CT_TYPE="0"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-
-if [ "$CT_TYPE" == "0" ]; then
-LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
-  cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-lxc.cgroup2.devices.allow: c 188:* rwm
-lxc.cgroup2.devices.allow: c 189:* rwm
-lxc.mount.entry: /dev/serial/by-id  dev/serial/by-id  none bind,optional,create=dir
-lxc.mount.entry: /dev/ttyUSB0       dev/ttyUSB0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyUSB1       dev/ttyUSB1       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM0       dev/ttyACM0       none bind,optional,create=file
-lxc.mount.entry: /dev/ttyACM1       dev/ttyACM1       none bind,optional,create=file
-EOF
-else
-  cat <<EOF >>$LXC_CONFIG
-lxc.cgroup2.devices.allow: a
-lxc.cap.drop:
-EOF
-fi
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"
-echo -e "${APP} should be reachable by going to the following URL.
-         ${BL}http://${IP}:8123${CL}
-Yacht should be reachable by going to the following URL.
-         ${BL}http://${IP}:8000${CL}\n"

+ 8 - 17
ct/podman-homeassistant-v5.sh

@@ -36,20 +36,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -146,7 +140,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -321,7 +314,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -413,7 +405,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 8 - 17
ct/podman-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

+ 0 - 327
ct/postgresql-v4.sh

@@ -1,327 +0,0 @@
-#!/usr/bin/env bash
-echo -e "Loading..."
-APP="PostgreSQL"
-var_disk="4"
-var_cpu="1"
-var_ram="1024"
-var_os="debian"
-var_version="11"
-NSAPP=$(echo ${APP,,} | tr -d ' ')
-var_install="${NSAPP}-install"
-NEXTID=$(pvesh get /cluster/nextid)
-INTEGER='^[0-9]+$'
-YW=$(echo "\033[33m")
-BL=$(echo "\033[36m")
-RD=$(echo "\033[01;31m")
-BGN=$(echo "\033[4;92m")
-GN=$(echo "\033[1;92m")
-DGN=$(echo "\033[32m")
-CL=$(echo "\033[m")
-BFR="\\r\\033[K"
-HOLD="-"
-CM="${GN}✓${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
-}
-if (whiptail --title "${APP} LXC" --yesno "This will create a New ${APP} LXC. Proceed?" 10 58); then
-  echo "User selected Yes"
-else
-  clear
-  echo -e "⚠ User exited script \n"
-  exit
-fi
-function header_info {
-  echo -e "${BL}
-    ____             __                 _____ ____    __ 
-   / __ \____  _____/ /_____ _________ / ___// __ \  / / 
-  / /_/ / __ \/ ___/ __/ __  / ___/ _ \\__ \/ / / / / /  
- / ____/ /_/ (__  ) /_/ /_/ / /  /  __/__/ / /_/ / / /___
-/_/    \____/____/\__/\__, /_/v4 \___/____/\___\_\/_____/
-                     /____/                              
-${CL}"
-}
-function msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-function msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-function PVE_CHECK() {
-  PVE=$(pveversion | grep "pve-manager/7" | wc -l)
-  if [[ $PVE != 1 ]]; then
-    echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function ARCH_CHECK() {
-  ARCH=$(dpkg --print-architecture)
-  if [[ "$ARCH" != "amd64" ]]; then
-    echo -e "\n ❌  This script will not work with PiMox! \n"
-    echo -e "Exiting..."
-    sleep 2
-    exit
-  fi
-}
-function default_settings() {
-  echo -e "${DGN}Using Container Type: ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
-  CT_TYPE="1"
-  echo -e "${DGN}Using Root Password: ${BGN}Automatic Login${CL}"
-  PW=""
-  echo -e "${DGN}Using Container ID: ${BGN}$NEXTID${CL}"
-  CT_ID=$NEXTID
-  echo -e "${DGN}Using Hostname: ${BGN}$NSAPP${CL}"
-  HN=$NSAPP
-  echo -e "${DGN}Using Disk Size: ${BGN}$var_disk${CL}${DGN}GB${CL}"
-  DISK_SIZE="$var_disk"
-  echo -e "${DGN}Allocated Cores ${BGN}$var_cpu${CL}"
-  CORE_COUNT="$var_cpu"
-  echo -e "${DGN}Allocated Ram ${BGN}$var_ram${CL}"
-  RAM_SIZE="$var_ram"
-  echo -e "${DGN}Using Bridge: ${BGN}vmbr0${CL}"
-  BRG="vmbr0"
-  echo -e "${DGN}Using Static IP Address: ${BGN}dhcp${CL}"
-  NET=dhcp
-  echo -e "${DGN}Using Gateway Address: ${BGN}Default${CL}"
-  GATE=""
-  echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-  SD=""
-  echo -e "${DGN}Using DNS Server Address: ${BGN}Host${CL}"
-  NS=""
-  echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
-  MAC=""
-  echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
-  VLAN=""
-    echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-  SSH="no"
-  echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-  VERB="no"
-  echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
-}
-function advanced_settings() {
-  CT_TYPE=$(whiptail --title "CONTAINER TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
-    "1" "Unprivileged" ON \
-    "0" "Privileged" OFF \
-    3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    echo -e "${DGN}Using Container Type: ${BGN}$CT_TYPE${CL}"
-  fi
-  PW1=$(whiptail --inputbox "Set Root Password (needed for root ssh access)" 8 58 --title "PASSWORD(leave blank for automatic login)" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $PW1 ]; then
-      PW1="Automatic Login" PW=" "
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    else
-      PW="-password $PW1"
-      echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-    fi
-  fi
-  CT_ID=$(whiptail --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_ID ]; then
-    CT_ID="$NEXTID"
-    echo -e "${DGN}Container ID: ${BGN}$CT_ID${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Container ID: ${BGN}$CT_ID${CL}"; fi
-  fi
-  CT_NAME=$(whiptail --inputbox "Set Hostname" 8 58 $NSAPP --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CT_NAME ]; then
-    HN="$NSAPP"
-    echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-  else
-    if [ $exitstatus = 0 ]; then
-      HN=$(echo ${CT_NAME,,} | tr -d ' ')
-      echo -e "${DGN}Using Hostname: ${BGN}$HN${CL}"
-    fi
-  fi
-  DISK_SIZE=$(whiptail --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $DISK_SIZE ]; then
-    DISK_SIZE="$var_disk"
-    echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Disk Size: ${BGN}$DISK_SIZE${CL}"; fi
-    if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
-      echo -e "${RD}⚠ DISK SIZE MUST BE A INTEGER NUMBER!${CL}"
-      advanced_settings
-    fi
-  fi
-  CORE_COUNT=$(whiptail --inputbox "Allocate CPU Cores" 8 58 $var_cpu --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $CORE_COUNT ]; then
-    CORE_COUNT="$var_cpu"
-    echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated Cores: ${BGN}$CORE_COUNT${CL}"; fi
-  fi
-  RAM_SIZE=$(whiptail --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $RAM_SIZE ]; then
-    RAM_SIZE="$var_ram"
-    echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Allocated RAM: ${BGN}$RAM_SIZE${CL}"; fi
-  fi
-  BRG=$(whiptail --inputbox "Set a Bridge" 8 58 vmbr0 --title "BRIDGE" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $BRG ]; then
-    BRG="vmbr0"
-    echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using Bridge: ${BGN}$BRG${CL}"; fi
-  fi
-  NET=$(whiptail --inputbox "Set a Static IPv4 CIDR Address(/24)" 8 58 dhcp --title "IP ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ -z $NET ]; then
-    NET="dhcp"
-    echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"
-  else
-    if [ $exitstatus = 0 ]; then echo -e "${DGN}Using IP Address: ${BGN}$NET${CL}"; fi
-  fi
-  GATE1=$(whiptail --inputbox "Set a Gateway IP (mandatory if Static IP was used)" 8 58 --title "GATEWAY IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $GATE1 ]; then
-      GATE1="Default" GATE=""
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    else
-      GATE=",gw=$GATE1"
-      echo -e "${DGN}Using Gateway IP Address: ${BGN}$GATE1${CL}"
-    fi
-  fi
-  SD=$(whiptail --inputbox "Set a DNS Search Domain (leave blank for HOST)" 8 58 --title "DNS Search Domain" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $SD ]; then
-      SD=""
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}Host${CL}"
-    else
-      SX=$SD
-      SD="-searchdomain=$SD"
-      echo -e "${DGN}Using DNS Search Domain: ${BGN}$SX${CL}"
-    fi
-  fi
-  NS=$(whiptail --inputbox "Set a DNS Server IP (leave blank for HOST)" 8 58 --title "DNS SERVER IP" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $NS ]; then
-      NS=""
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}Host${CL}"
-    else
-      NX=$NS
-      NS="-nameserver=$NS"
-      echo -e "${DGN}Using DNS Server IP Address: ${BGN}$NX${CL}"
-    fi
-  fi
-  MAC1=$(whiptail --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $MAC1 ]; then
-      MAC1="Default" MAC=""
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    else
-      MAC=",hwaddr=$MAC1"
-      echo -e "${DGN}Using MAC Address: ${BGN}$MAC1${CL}"
-    fi
-  fi
-  VLAN1=$(whiptail --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" --cancel-button Exit-Script 3>&1 1>&2 2>&3)
-  exitstatus=$?
-  if [ $exitstatus = 0 ]; then
-    if [ -z $VLAN1 ]; then
-      VLAN1="Default" VLAN=""
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    else
-      VLAN=",tag=$VLAN1"
-      echo -e "${DGN}Using Vlan: ${BGN}$VLAN1${CL}"
-    fi
-  fi
-  if (whiptail --defaultno --title "SSH ACCESS" --yesno "Enable Root SSH Access?" 10 58); then
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}Yes${CL}"
-      SSH="yes"
-  else
-      echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
-      SSH="no"
-  fi
-  if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
-      VERB="yes"
-  else
-      echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
-      VERB="no"
-  fi
-  if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
-    echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
-  else
-    clear
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-function start_script() {
-  if (whiptail --title "SETTINGS" --yesno "Use Default Settings?" --no-button Advanced 10 58); then
-    header_info
-    echo -e "${BL}Using Default Settings${CL}"
-    default_settings
-  else
-    header_info
-    echo -e "${RD}Using Advanced Settings${CL}"
-    advanced_settings
-  fi
-}
-clear
-start_script
-if [ "$VERB" == "yes" ]; then set -x; fi
-if [ "$CT_TYPE" == "1" ]; then
-  FEATURES="nesting=1,keyctl=1"
-else
-  FEATURES="nesting=1"
-fi
-TEMP_DIR=$(mktemp -d)
-pushd $TEMP_DIR >/dev/null
-export VERBOSE=$VERB
-export SSH_ROOT=${SSH}
-export CTID=$CT_ID
-export PCT_OSTYPE=$var_os
-export PCT_OSVERSION=$var_version
-export PCT_DISK_SIZE=$DISK_SIZE
-export PCT_OPTIONS="
-  -features $FEATURES
-  -hostname $HN
-  $SD
-  $NS
-  -net0 name=eth0,bridge=$BRG$MAC,ip=$NET$GATE$VLAN
-  -onboot 1
-  -cores $CORE_COUNT
-  -memory $RAM_SIZE
-  -unprivileged $CT_TYPE
-  $PW
-"
-bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
-msg_info "Starting LXC Container"
-pct start $CTID
-msg_ok "Started LXC Container"
-lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
-IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
-pct set $CTID -description "# ${APP} LXC
-### https://tteck.github.io/Proxmox/
-<a href='https://ko-fi.com/D1D7EP4GF'><img src='https://img.shields.io/badge/☕-Buy me a coffee-red' /></a>"
-msg_ok "Completed Successfully!\n"

+ 8 - 17
ct/postgresql-v5.sh

@@ -32,20 +32,14 @@ BFR="\\r\\033[K"
 HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
-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 occurred."
-  local msg="${1:-$reason}"
-  local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE"
-  echo -e "$flag $msg" 1>&2
-  exit $EXIT
+set -Eeuo pipefail
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  echo -e "\n$error_message\n"
 }
 
 function msg_info() {
@@ -142,7 +136,6 @@ function default_settings() {
   SSH="no"
   echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
   VERB="no"
-  VERB2="silent"
   echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
 }
 function advanced_settings() {
@@ -317,7 +310,6 @@ function advanced_settings() {
   else
       echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
       VERB="no"
-      VERB2="silent"
   fi
   if (whiptail --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create ${APP} LXC?" --no-button Do-Over 10 58); then
     echo -e "${RD}Creating a ${APP} LXC using the above advanced settings${CL}"
@@ -363,7 +355,6 @@ TEMP_DIR=$(mktemp -d)
 pushd $TEMP_DIR >/dev/null
 export DISABLEIPV6=$DISABLEIP6
 export VERBOSE=$VERB
-export STD=$VERB2
 export SSH_ROOT=${SSH}
 export CTID=$CT_ID
 export PCT_OSTYPE=$var_os

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott