From ea0dd0434c35b6045a55bc0a53b73dbf297b4015 Mon Sep 17 00:00:00 2001
From: CLHatch <CLHatch@gmail.com>
Date: Sun, 8 Sep 2024 12:47:11 -0500
Subject: [PATCH 1/2] fix: `ds` getting false positives for special variables

`ds` was detecting variables such as `GLUETUN_ENVIRONMENT_VPN_PORT_FORWARDING` as being a `GLUETUN_PORT_XXXX` variable.
---
 .scripts/menu_value_prompt.sh | 259 ++++++++++++++++++++++++++++++++--
 1 file changed, 248 insertions(+), 11 deletions(-)

diff --git a/.scripts/menu_value_prompt.sh b/.scripts/menu_value_prompt.sh
index 697057f4c6..c2eeeb210c 100644
--- a/.scripts/menu_value_prompt.sh
+++ b/.scripts/menu_value_prompt.sh
@@ -63,22 +63,22 @@ menu_value_prompt() {
     VALUEOPTIONS+=("Enter New " "")
 
     case "${SET_VAR}" in
-        *_ENABLED)
+        ${APPNAME}_ENABLED)
             VALUEDESCRIPTION='\n\n Must be true or false.'
             ;;
-        *_NETWORK_MODE)
+        ${APPNAME}_NETWORK_MODE)
             VALUEDESCRIPTION='\n\n Network Mode is usually left blank but can also be bridge, host, none, service: <APPNAME>, or container: <APPNAME>.'
             ;;
-        *_PORT_*)
+        ${APPNAME}_PORT_*)
             VALUEDESCRIPTION='\n\n Must be an unused port between 0 and 65535.'
             ;;
-        *_RESTART)
+        ${APPNAME}_RESTART)
             VALUEDESCRIPTION='\n\n Restart is usually unless-stopped but can also be no, always, or on-failure.'
             ;;
-        *_TAG)
+        ${APPNAME}_TAG)
             VALUEDESCRIPTION='\n\n Tag is usually latest but can also be other values based on the image.'
             ;;
-        *_VOLUME_*)
+        ${APPNAME}_VOLUME_*)
             VALUEDESCRIPTION='\n\n If the directory selected does not exist we will attempt to create it.'
             ;;
         DOCKER_GID)
@@ -142,7 +142,7 @@ menu_value_prompt() {
         menu_value_prompt "${SET_VAR}"
     else
         case "${SET_VAR}" in
-            *_ENABLED)
+            ${APPNAME}_ENABLED)
                 if [[ ${INPUT} == true ]] || [[ ${INPUT} == false ]]; then
                     run_script 'env_set' "${SET_VAR}" "${INPUT}"
                 else
@@ -150,7 +150,7 @@ menu_value_prompt() {
                     menu_value_prompt "${SET_VAR}"
                 fi
                 ;;
-            *_NETWORK_MODE)
+            ${APPNAME}_NETWORK_MODE)
                 case "${INPUT}" in
                     "" | "bridge" | "host" | "none" | "service:"* | "container:"*)
                         run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -161,7 +161,7 @@ menu_value_prompt() {
                         ;;
                 esac
                 ;;
-            *_PORT_*)
+            ${APPNAME}_PORT_*)
                 if [[ ${INPUT} =~ ^[0-9]+$ ]] || [[ ${INPUT} -ge 0 ]] || [[ ${INPUT} -le 65535 ]]; then
                     run_script 'env_set' "${SET_VAR}" "${INPUT}"
                 else
@@ -169,7 +169,7 @@ menu_value_prompt() {
                     menu_value_prompt "${SET_VAR}"
                 fi
                 ;;
-            *_RESTART)
+            ${APPNAME}_RESTART)
                 case "${INPUT}" in
                     "no" | "always" | "on-failure" | "unless-stopped")
                         run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -180,7 +180,244 @@ menu_value_prompt() {
                         ;;
                 esac
                 ;;
-            *_VOLUME_*)
+            ${APPNAME}_VOLUME_*)
+                if [[ ${INPUT} == "/" ]]; then
+                    whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use / for ${SET_VAR}. Please select another folder." 0 0
+                    menu_value_prompt "${SET_VAR}"
+                elif [[ ${INPUT} == ~* ]]; then
+                    local CORRECTED_DIR="${DETECTED_HOMEDIR}${INPUT#*~}"
+                    if run_script 'question_prompt' "${PROMPT-}" Y "Cannot use the ~ shortcut in ${SET_VAR}. Would you like to use ${CORRECTED_DIR} instead?"; then
+                        run_script 'env_set' "${SET_VAR}" "${CORRECTED_DIR}"
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "Returning to the previous menu to confirm selection." 0 0
+                    else
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use the ~ shortcut in ${SET_VAR}. Please select another folder." 0 0
+                    fi
+                    menu_value_prompt "${SET_VAR}"
+                elif [[ -d ${INPUT} ]]; then
+                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                    if run_script 'question_prompt' "${PROMPT-}" Y "Would you like to set permissions on ${INPUT} ?"; then
+                        run_script 'set_permissions' "${INPUT}"
+                    fi
+                else
+                    if run_script 'question_prompt' "${PROMPT-}" Y "${INPUT} is not a valid path. Would you like to attempt to create it?"; then
+                        mkdir -p "${INPUT}" || fatal "Failed to make directory.\nFailing command: ${F[C]}mkdir -p \"${INPUT}\""
+                        run_script 'set_permissions' "${INPUT}"
+                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} folder was created successfully." 0 0
+                    else
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid path. Please try setting ${SET_VAR} again." 0 0
+                        menu_value_prompt "${SET_VAR}"
+                    fi
+                fi
+                ;;
+            P[GU]ID)
+                if [[ ${INPUT} == "0" ]]; then
+                    if run_script 'question_prompt' "${PROMPT-}" Y "Running as root is not recommended. Would you like to select a different ID?"; then
+                        menu_value_prompt "${SET_VAR}"
+                    else
+                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                    fi
+                elif [[ ${INPUT} =~ ^[0-9]+$ ]]; then
+                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                else
+                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid ${SET_VAR}. Please try setting ${SET_VAR} again." 0 0
+                    menu_value_prompt "${SET_VAR}"
+                fi
+                ;;
+            *)
+                run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                ;;
+        esac
+    fi
+}
+
+test_menu_value_prompt() {
+    # run_script 'menu_value_prompt'
+    warn "CI does not test menu_value_prompt."
+}
+#!/usr/bin/env bash
+set -Eeuo pipefail
+IFS=$'\n\t'
+
+menu_value_prompt() {
+    local SET_VAR=${1-}
+
+    local CURRENT_VAL
+    CURRENT_VAL=$(run_script 'env_get' "${SET_VAR}")
+
+    local APPNAME=${SET_VAR%%_*}
+    local FILENAME=${APPNAME,,}
+    local APPTEMPLATES="${SCRIPTPATH}/compose/.apps/${FILENAME}"
+    local VAR_LABEL=${SET_VAR,,}
+
+    local DEFAULT_VAL
+    if grep -q -Po "^${SET_VAR}=\K.*" "${COMPOSE_ENV}.example"; then
+        DEFAULT_VAL=$(grep --color=never -Po "^${SET_VAR}=\K.*" "${COMPOSE_ENV}.example" || true)
+    else
+        DEFAULT_VAL=$(grep --color=never -Po "\scom\.dockstarter\.appvars\.${VAR_LABEL}: \K.*" "${APPTEMPLATES}/${FILENAME}.labels.yml" | sed -E 's/^([^"].*[^"])$/"\1"/' | xargs || true)
+    fi
+
+    local HOME_VAL
+    local SYSTEM_VAL
+    local VALUEDESCRIPTION
+    local VALUEOPTIONS=()
+    VALUEOPTIONS+=("Keep Current " "${CURRENT_VAL}")
+
+    case "${SET_VAR}" in
+        DOCKER_GID)
+            SYSTEM_VAL=$(cut -d: -f3 < <(getent group docker))
+            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
+            ;;
+        DOCKER_HOSTNAME)
+            SYSTEM_VAL=${HOSTNAME}
+            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
+            ;;
+        DOCKER_VOLUME_CONFIG)
+            HOME_VAL="${DETECTED_HOMEDIR}/.config/appdata"
+            VALUEOPTIONS+=("Use Home " "${HOME_VAL}")
+            ;;
+        DOCKER_VOLUME_STORAGE)
+            HOME_VAL="${DETECTED_HOMEDIR}/storage"
+            VALUEOPTIONS+=("Use Home " "${HOME_VAL}")
+            ;;
+        PGID)
+            SYSTEM_VAL=${DETECTED_PGID}
+            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
+            ;;
+        PUID)
+            SYSTEM_VAL=${DETECTED_PUID}
+            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
+            ;;
+        TZ)
+            SYSTEM_VAL=$(cat /etc/timezone)
+            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
+            ;;
+        *)
+            VALUEOPTIONS+=("Use Default " "${DEFAULT_VAL}")
+            ;;
+    esac
+
+    VALUEOPTIONS+=("Enter New " "")
+
+    case "${SET_VAR}" in
+        ${APPNAME}_ENABLED)
+            VALUEDESCRIPTION='\n\n Must be true or false.'
+            ;;
+        ${APPNAME}_NETWORK_MODE)
+            VALUEDESCRIPTION='\n\n Network Mode is usually left blank but can also be bridge, host, none, service: <APPNAME>, or container: <APPNAME>.'
+            ;;
+        ${APPNAME}_PORT_*)
+            VALUEDESCRIPTION='\n\n Must be an unused port between 0 and 65535.'
+            ;;
+        ${APPNAME}_RESTART)
+            VALUEDESCRIPTION='\n\n Restart is usually unless-stopped but can also be no, always, or on-failure.'
+            ;;
+        ${APPNAME}_TAG)
+            VALUEDESCRIPTION='\n\n Tag is usually latest but can also be other values based on the image.'
+            ;;
+        ${APPNAME}_VOLUME_*)
+            VALUEDESCRIPTION='\n\n If the directory selected does not exist we will attempt to create it.'
+            ;;
+        DOCKER_GID)
+            VALUEDESCRIPTION='\n\n This should be the Docker group ID. If you are unsure, select Use System.'
+            ;;
+        DOCKER_HOSTNAME)
+            VALUEDESCRIPTION='\n\n This should be your system hostname. If you are unsure, select Use System.'
+            ;;
+        PGID)
+            VALUEDESCRIPTION='\n\n This should be your user group ID. If you are unsure, select Use System.'
+            ;;
+        PUID)
+            VALUEDESCRIPTION='\n\n This should be your user account ID. If you are unsure, select Use System.'
+            ;;
+        TZ)
+            VALUEDESCRIPTION='\n\n If this is not the correct timezone please exit and set your system timezone.'
+            ;;
+        *)
+            VALUEDESCRIPTION=""
+            ;;
+    esac
+
+    if [[ -n ${SYSTEM_VAL-} ]]; then
+        VALUEDESCRIPTION="\n\n System detected values are recommended.${VALUEDESCRIPTION}"
+    fi
+
+    local SELECTEDVALUE
+    if [[ ${CI-} == true ]]; then
+        SELECTEDVALUE="Keep Current "
+    else
+        SELECTEDVALUE=$(whiptail --fb --clear --title "DockSTARTer" --menu "What would you like set for ${SET_VAR}?${VALUEDESCRIPTION}" 0 0 0 "${VALUEOPTIONS[@]}" 3>&1 1>&2 2>&3 || echo "Cancel")
+    fi
+
+    local INPUT
+    case "${SELECTEDVALUE}" in
+        "Keep Current ")
+            INPUT=${CURRENT_VAL}
+            ;;
+        "Use Home ")
+            INPUT=${HOME_VAL}
+            ;;
+        "Use Default ")
+            INPUT=${DEFAULT_VAL}
+            ;;
+        "Use System ")
+            INPUT=${SYSTEM_VAL}
+            ;;
+        "Enter New ")
+            INPUT=$(whiptail --fb --clear --title "DockSTARTer" --inputbox "What would you like set for ${SET_VAR}?${VALUEDESCRIPTION}" 0 0 "${CURRENT_VAL}" 3>&1 1>&2 2>&3 || echo "CancelNewEntry")
+            ;;
+        "Cancel")
+            warn "Selection of ${SET_VAR} was canceled."
+            return 1
+            ;;
+        *)
+            fatal "Invalid Option."
+            ;;
+    esac
+
+    if [[ ${INPUT} == "CancelNewEntry" ]]; then
+        menu_value_prompt "${SET_VAR}"
+    else
+        case "${SET_VAR}" in
+            ${APPNAME}_ENABLED)
+                if [[ ${INPUT} == true ]] || [[ ${INPUT} == false ]]; then
+                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                else
+                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not true or false. Please try setting ${SET_VAR} again." 0 0
+                    menu_value_prompt "${SET_VAR}"
+                fi
+                ;;
+            ${APPNAME}_NETWORK_MODE)
+                case "${INPUT}" in
+                    "" | "bridge" | "host" | "none" | "service:"* | "container:"*)
+                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                        ;;
+                    *)
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid network mode. Please try setting ${SET_VAR} again." 0 0
+                        menu_value_prompt "${SET_VAR}"
+                        ;;
+                esac
+                ;;
+            ${APPNAME}_PORT_*)
+                if [[ ${INPUT} =~ ^[0-9]+$ ]] || [[ ${INPUT} -ge 0 ]] || [[ ${INPUT} -le 65535 ]]; then
+                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                else
+                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid port. Please try setting ${SET_VAR} again." 0 0
+                    menu_value_prompt "${SET_VAR}"
+                fi
+                ;;
+            ${APPNAME}_RESTART)
+                case "${INPUT}" in
+                    "no" | "always" | "on-failure" | "unless-stopped")
+                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
+                        ;;
+                    *)
+                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid restart value. Please try setting ${SET_VAR} again." 0 0
+                        menu_value_prompt "${SET_VAR}"
+                        ;;
+                esac
+                ;;
+            ${APPNAME}_VOLUME_*)
                 if [[ ${INPUT} == "/" ]]; then
                     whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use / for ${SET_VAR}. Please select another folder." 0 0
                     menu_value_prompt "${SET_VAR}"

From b1fa6ea8249d01cb8d17d70d390d943859d1c72c Mon Sep 17 00:00:00 2001
From: CLHatch <CLHatch@gmail.com>
Date: Sun, 8 Sep 2024 12:55:30 -0500
Subject: [PATCH 2/2] Update menu_value_prompt.sh

---
 .scripts/menu_value_prompt.sh | 259 ++--------------------------------
 1 file changed, 11 insertions(+), 248 deletions(-)

diff --git a/.scripts/menu_value_prompt.sh b/.scripts/menu_value_prompt.sh
index c2eeeb210c..05af1d146d 100644
--- a/.scripts/menu_value_prompt.sh
+++ b/.scripts/menu_value_prompt.sh
@@ -63,22 +63,22 @@ menu_value_prompt() {
     VALUEOPTIONS+=("Enter New " "")
 
     case "${SET_VAR}" in
-        ${APPNAME}_ENABLED)
+        "${APPNAME}_ENABLED")
             VALUEDESCRIPTION='\n\n Must be true or false.'
             ;;
-        ${APPNAME}_NETWORK_MODE)
+        "${APPNAME}_NETWORK_MODE")
             VALUEDESCRIPTION='\n\n Network Mode is usually left blank but can also be bridge, host, none, service: <APPNAME>, or container: <APPNAME>.'
             ;;
-        ${APPNAME}_PORT_*)
+        "${APPNAME}_PORT_"*)
             VALUEDESCRIPTION='\n\n Must be an unused port between 0 and 65535.'
             ;;
-        ${APPNAME}_RESTART)
+        "${APPNAME}_RESTART")
             VALUEDESCRIPTION='\n\n Restart is usually unless-stopped but can also be no, always, or on-failure.'
             ;;
-        ${APPNAME}_TAG)
+        "${APPNAME}_TAG")
             VALUEDESCRIPTION='\n\n Tag is usually latest but can also be other values based on the image.'
             ;;
-        ${APPNAME}_VOLUME_*)
+        "${APPNAME}_VOLUME_"*)
             VALUEDESCRIPTION='\n\n If the directory selected does not exist we will attempt to create it.'
             ;;
         DOCKER_GID)
@@ -142,7 +142,7 @@ menu_value_prompt() {
         menu_value_prompt "${SET_VAR}"
     else
         case "${SET_VAR}" in
-            ${APPNAME}_ENABLED)
+            "${APPNAME}_ENABLED")
                 if [[ ${INPUT} == true ]] || [[ ${INPUT} == false ]]; then
                     run_script 'env_set' "${SET_VAR}" "${INPUT}"
                 else
@@ -150,7 +150,7 @@ menu_value_prompt() {
                     menu_value_prompt "${SET_VAR}"
                 fi
                 ;;
-            ${APPNAME}_NETWORK_MODE)
+            "${APPNAME}_NETWORK_MODE")
                 case "${INPUT}" in
                     "" | "bridge" | "host" | "none" | "service:"* | "container:"*)
                         run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -161,7 +161,7 @@ menu_value_prompt() {
                         ;;
                 esac
                 ;;
-            ${APPNAME}_PORT_*)
+            "${APPNAME}_PORT_"*)
                 if [[ ${INPUT} =~ ^[0-9]+$ ]] || [[ ${INPUT} -ge 0 ]] || [[ ${INPUT} -le 65535 ]]; then
                     run_script 'env_set' "${SET_VAR}" "${INPUT}"
                 else
@@ -169,7 +169,7 @@ menu_value_prompt() {
                     menu_value_prompt "${SET_VAR}"
                 fi
                 ;;
-            ${APPNAME}_RESTART)
+            "${APPNAME}_RESTART")
                 case "${INPUT}" in
                     "no" | "always" | "on-failure" | "unless-stopped")
                         run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -180,244 +180,7 @@ menu_value_prompt() {
                         ;;
                 esac
                 ;;
-            ${APPNAME}_VOLUME_*)
-                if [[ ${INPUT} == "/" ]]; then
-                    whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use / for ${SET_VAR}. Please select another folder." 0 0
-                    menu_value_prompt "${SET_VAR}"
-                elif [[ ${INPUT} == ~* ]]; then
-                    local CORRECTED_DIR="${DETECTED_HOMEDIR}${INPUT#*~}"
-                    if run_script 'question_prompt' "${PROMPT-}" Y "Cannot use the ~ shortcut in ${SET_VAR}. Would you like to use ${CORRECTED_DIR} instead?"; then
-                        run_script 'env_set' "${SET_VAR}" "${CORRECTED_DIR}"
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "Returning to the previous menu to confirm selection." 0 0
-                    else
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use the ~ shortcut in ${SET_VAR}. Please select another folder." 0 0
-                    fi
-                    menu_value_prompt "${SET_VAR}"
-                elif [[ -d ${INPUT} ]]; then
-                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                    if run_script 'question_prompt' "${PROMPT-}" Y "Would you like to set permissions on ${INPUT} ?"; then
-                        run_script 'set_permissions' "${INPUT}"
-                    fi
-                else
-                    if run_script 'question_prompt' "${PROMPT-}" Y "${INPUT} is not a valid path. Would you like to attempt to create it?"; then
-                        mkdir -p "${INPUT}" || fatal "Failed to make directory.\nFailing command: ${F[C]}mkdir -p \"${INPUT}\""
-                        run_script 'set_permissions' "${INPUT}"
-                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} folder was created successfully." 0 0
-                    else
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid path. Please try setting ${SET_VAR} again." 0 0
-                        menu_value_prompt "${SET_VAR}"
-                    fi
-                fi
-                ;;
-            P[GU]ID)
-                if [[ ${INPUT} == "0" ]]; then
-                    if run_script 'question_prompt' "${PROMPT-}" Y "Running as root is not recommended. Would you like to select a different ID?"; then
-                        menu_value_prompt "${SET_VAR}"
-                    else
-                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                    fi
-                elif [[ ${INPUT} =~ ^[0-9]+$ ]]; then
-                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                else
-                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid ${SET_VAR}. Please try setting ${SET_VAR} again." 0 0
-                    menu_value_prompt "${SET_VAR}"
-                fi
-                ;;
-            *)
-                run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                ;;
-        esac
-    fi
-}
-
-test_menu_value_prompt() {
-    # run_script 'menu_value_prompt'
-    warn "CI does not test menu_value_prompt."
-}
-#!/usr/bin/env bash
-set -Eeuo pipefail
-IFS=$'\n\t'
-
-menu_value_prompt() {
-    local SET_VAR=${1-}
-
-    local CURRENT_VAL
-    CURRENT_VAL=$(run_script 'env_get' "${SET_VAR}")
-
-    local APPNAME=${SET_VAR%%_*}
-    local FILENAME=${APPNAME,,}
-    local APPTEMPLATES="${SCRIPTPATH}/compose/.apps/${FILENAME}"
-    local VAR_LABEL=${SET_VAR,,}
-
-    local DEFAULT_VAL
-    if grep -q -Po "^${SET_VAR}=\K.*" "${COMPOSE_ENV}.example"; then
-        DEFAULT_VAL=$(grep --color=never -Po "^${SET_VAR}=\K.*" "${COMPOSE_ENV}.example" || true)
-    else
-        DEFAULT_VAL=$(grep --color=never -Po "\scom\.dockstarter\.appvars\.${VAR_LABEL}: \K.*" "${APPTEMPLATES}/${FILENAME}.labels.yml" | sed -E 's/^([^"].*[^"])$/"\1"/' | xargs || true)
-    fi
-
-    local HOME_VAL
-    local SYSTEM_VAL
-    local VALUEDESCRIPTION
-    local VALUEOPTIONS=()
-    VALUEOPTIONS+=("Keep Current " "${CURRENT_VAL}")
-
-    case "${SET_VAR}" in
-        DOCKER_GID)
-            SYSTEM_VAL=$(cut -d: -f3 < <(getent group docker))
-            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
-            ;;
-        DOCKER_HOSTNAME)
-            SYSTEM_VAL=${HOSTNAME}
-            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
-            ;;
-        DOCKER_VOLUME_CONFIG)
-            HOME_VAL="${DETECTED_HOMEDIR}/.config/appdata"
-            VALUEOPTIONS+=("Use Home " "${HOME_VAL}")
-            ;;
-        DOCKER_VOLUME_STORAGE)
-            HOME_VAL="${DETECTED_HOMEDIR}/storage"
-            VALUEOPTIONS+=("Use Home " "${HOME_VAL}")
-            ;;
-        PGID)
-            SYSTEM_VAL=${DETECTED_PGID}
-            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
-            ;;
-        PUID)
-            SYSTEM_VAL=${DETECTED_PUID}
-            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
-            ;;
-        TZ)
-            SYSTEM_VAL=$(cat /etc/timezone)
-            VALUEOPTIONS+=("Use System " "${SYSTEM_VAL}")
-            ;;
-        *)
-            VALUEOPTIONS+=("Use Default " "${DEFAULT_VAL}")
-            ;;
-    esac
-
-    VALUEOPTIONS+=("Enter New " "")
-
-    case "${SET_VAR}" in
-        ${APPNAME}_ENABLED)
-            VALUEDESCRIPTION='\n\n Must be true or false.'
-            ;;
-        ${APPNAME}_NETWORK_MODE)
-            VALUEDESCRIPTION='\n\n Network Mode is usually left blank but can also be bridge, host, none, service: <APPNAME>, or container: <APPNAME>.'
-            ;;
-        ${APPNAME}_PORT_*)
-            VALUEDESCRIPTION='\n\n Must be an unused port between 0 and 65535.'
-            ;;
-        ${APPNAME}_RESTART)
-            VALUEDESCRIPTION='\n\n Restart is usually unless-stopped but can also be no, always, or on-failure.'
-            ;;
-        ${APPNAME}_TAG)
-            VALUEDESCRIPTION='\n\n Tag is usually latest but can also be other values based on the image.'
-            ;;
-        ${APPNAME}_VOLUME_*)
-            VALUEDESCRIPTION='\n\n If the directory selected does not exist we will attempt to create it.'
-            ;;
-        DOCKER_GID)
-            VALUEDESCRIPTION='\n\n This should be the Docker group ID. If you are unsure, select Use System.'
-            ;;
-        DOCKER_HOSTNAME)
-            VALUEDESCRIPTION='\n\n This should be your system hostname. If you are unsure, select Use System.'
-            ;;
-        PGID)
-            VALUEDESCRIPTION='\n\n This should be your user group ID. If you are unsure, select Use System.'
-            ;;
-        PUID)
-            VALUEDESCRIPTION='\n\n This should be your user account ID. If you are unsure, select Use System.'
-            ;;
-        TZ)
-            VALUEDESCRIPTION='\n\n If this is not the correct timezone please exit and set your system timezone.'
-            ;;
-        *)
-            VALUEDESCRIPTION=""
-            ;;
-    esac
-
-    if [[ -n ${SYSTEM_VAL-} ]]; then
-        VALUEDESCRIPTION="\n\n System detected values are recommended.${VALUEDESCRIPTION}"
-    fi
-
-    local SELECTEDVALUE
-    if [[ ${CI-} == true ]]; then
-        SELECTEDVALUE="Keep Current "
-    else
-        SELECTEDVALUE=$(whiptail --fb --clear --title "DockSTARTer" --menu "What would you like set for ${SET_VAR}?${VALUEDESCRIPTION}" 0 0 0 "${VALUEOPTIONS[@]}" 3>&1 1>&2 2>&3 || echo "Cancel")
-    fi
-
-    local INPUT
-    case "${SELECTEDVALUE}" in
-        "Keep Current ")
-            INPUT=${CURRENT_VAL}
-            ;;
-        "Use Home ")
-            INPUT=${HOME_VAL}
-            ;;
-        "Use Default ")
-            INPUT=${DEFAULT_VAL}
-            ;;
-        "Use System ")
-            INPUT=${SYSTEM_VAL}
-            ;;
-        "Enter New ")
-            INPUT=$(whiptail --fb --clear --title "DockSTARTer" --inputbox "What would you like set for ${SET_VAR}?${VALUEDESCRIPTION}" 0 0 "${CURRENT_VAL}" 3>&1 1>&2 2>&3 || echo "CancelNewEntry")
-            ;;
-        "Cancel")
-            warn "Selection of ${SET_VAR} was canceled."
-            return 1
-            ;;
-        *)
-            fatal "Invalid Option."
-            ;;
-    esac
-
-    if [[ ${INPUT} == "CancelNewEntry" ]]; then
-        menu_value_prompt "${SET_VAR}"
-    else
-        case "${SET_VAR}" in
-            ${APPNAME}_ENABLED)
-                if [[ ${INPUT} == true ]] || [[ ${INPUT} == false ]]; then
-                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                else
-                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not true or false. Please try setting ${SET_VAR} again." 0 0
-                    menu_value_prompt "${SET_VAR}"
-                fi
-                ;;
-            ${APPNAME}_NETWORK_MODE)
-                case "${INPUT}" in
-                    "" | "bridge" | "host" | "none" | "service:"* | "container:"*)
-                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                        ;;
-                    *)
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid network mode. Please try setting ${SET_VAR} again." 0 0
-                        menu_value_prompt "${SET_VAR}"
-                        ;;
-                esac
-                ;;
-            ${APPNAME}_PORT_*)
-                if [[ ${INPUT} =~ ^[0-9]+$ ]] || [[ ${INPUT} -ge 0 ]] || [[ ${INPUT} -le 65535 ]]; then
-                    run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                else
-                    whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid port. Please try setting ${SET_VAR} again." 0 0
-                    menu_value_prompt "${SET_VAR}"
-                fi
-                ;;
-            ${APPNAME}_RESTART)
-                case "${INPUT}" in
-                    "no" | "always" | "on-failure" | "unless-stopped")
-                        run_script 'env_set' "${SET_VAR}" "${INPUT}"
-                        ;;
-                    *)
-                        whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid restart value. Please try setting ${SET_VAR} again." 0 0
-                        menu_value_prompt "${SET_VAR}"
-                        ;;
-                esac
-                ;;
-            ${APPNAME}_VOLUME_*)
+            "${APPNAME}_VOLUME_"*)
                 if [[ ${INPUT} == "/" ]]; then
                     whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use / for ${SET_VAR}. Please select another folder." 0 0
                     menu_value_prompt "${SET_VAR}"