Skip to content

Commit cdcd77d

Browse files
committed
Fix the GUI to use the new standard of APPNAME__VARNAME from the old APPNAME_VARNAME
1 parent c25896e commit cdcd77d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.scripts/menu_app_select.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ menu_app_select() {
2222
continue
2323
fi
2424
local APPONOFF
25-
if [[ $(run_script 'env_get' "${APPNAME}_ENABLED") == true ]]; then
25+
if [[ $(run_script 'env_get' "${APPNAME}__ENABLED") == true ]]; then
2626
APPONOFF="on"
2727
else
2828
APPONOFF="off"
@@ -44,15 +44,15 @@ menu_app_select() {
4444
else
4545
info "Disabling all apps."
4646
while IFS= read -r line; do
47-
local APPNAME=${line%%_ENABLED=*}
48-
run_script 'env_set' "${APPNAME}_ENABLED" false
49-
done < <(grep --color=never -P '_ENABLED='"'"'?true'"'"'?$' "${COMPOSE_ENV}")
47+
local APPNAME=${line%%__ENABLED=*}
48+
run_script 'env_set' "${APPNAME}__ENABLED" false
49+
done < <(grep --color=never -P '__ENABLED='"'"'?true'"'"'?$' "${COMPOSE_ENV}")
5050

5151
info "Enabling selected apps."
5252
while IFS= read -r line; do
5353
local APPNAME=${line^^}
5454
run_script 'appvars_create' "${APPNAME}"
55-
run_script 'env_set' "${APPNAME}_ENABLED" true
55+
run_script 'env_set' "${APPNAME}__ENABLED" true
5656
done < <(echo "${SELECTEDAPPS}")
5757

5858
run_script 'appvars_purge_all'

.scripts/menu_app_vars.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ menu_app_vars() {
66
local APPNAME=${1-}
77
run_script 'appvars_create' "${APPNAME}"
88
local APPVARS
9-
APPVARS=$(grep -v -P "^${APPNAME}_ENABLED=" "${COMPOSE_ENV}" | grep --color=never -P "^${APPNAME}_")
9+
APPVARS=$(grep -v -P "^${APPNAME}__ENABLED=" "${COMPOSE_ENV}" | grep --color=never -P "^${APPNAME}__")
1010
if [[ -z ${APPVARS} ]]; then
1111
if [[ ${CI-} == true ]]; then
1212
warn "${APPNAME} has no variables."

.scripts/menu_value_prompt.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,22 @@ menu_value_prompt() {
6363
VALUEOPTIONS+=("Enter New " "")
6464

6565
case "${SET_VAR}" in
66-
"${APPNAME}_ENABLED")
66+
"${APPNAME}__ENABLED")
6767
VALUEDESCRIPTION='\n\n Must be true or false.'
6868
;;
69-
"${APPNAME}_NETWORK_MODE")
69+
"${APPNAME}__NETWORK_MODE")
7070
VALUEDESCRIPTION='\n\n Network Mode is usually left blank but can also be bridge, host, none, service: <APPNAME>, or container: <APPNAME>.'
7171
;;
72-
"${APPNAME}_PORT_"*)
72+
"${APPNAME}__PORT_"*)
7373
VALUEDESCRIPTION='\n\n Must be an unused port between 0 and 65535.'
7474
;;
75-
"${APPNAME}_RESTART")
75+
"${APPNAME}__RESTART")
7676
VALUEDESCRIPTION='\n\n Restart is usually unless-stopped but can also be no, always, or on-failure.'
7777
;;
78-
"${APPNAME}_TAG")
78+
"${APPNAME}__TAG")
7979
VALUEDESCRIPTION='\n\n Tag is usually latest but can also be other values based on the image.'
8080
;;
81-
"${APPNAME}_VOLUME_"*)
81+
"${APPNAME}__VOLUME_"*)
8282
VALUEDESCRIPTION='\n\n If the directory selected does not exist we will attempt to create it.'
8383
;;
8484
DOCKER_GID)
@@ -142,15 +142,15 @@ menu_value_prompt() {
142142
menu_value_prompt "${SET_VAR}"
143143
else
144144
case "${SET_VAR}" in
145-
"${APPNAME}_ENABLED")
145+
"${APPNAME}__ENABLED")
146146
if [[ ${INPUT} == true ]] || [[ ${INPUT} == false ]]; then
147147
run_script 'env_set' "${SET_VAR}" "${INPUT}"
148148
else
149149
whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not true or false. Please try setting ${SET_VAR} again." 0 0
150150
menu_value_prompt "${SET_VAR}"
151151
fi
152152
;;
153-
"${APPNAME}_NETWORK_MODE")
153+
"${APPNAME}__NETWORK_MODE")
154154
case "${INPUT}" in
155155
"" | "bridge" | "host" | "none" | "service:"* | "container:"*)
156156
run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -161,15 +161,15 @@ menu_value_prompt() {
161161
;;
162162
esac
163163
;;
164-
"${APPNAME}_PORT_"*)
164+
"${APPNAME}__PORT_"*)
165165
if [[ ${INPUT} =~ ^[0-9]+$ ]] || [[ ${INPUT} -ge 0 ]] || [[ ${INPUT} -le 65535 ]]; then
166166
run_script 'env_set' "${SET_VAR}" "${INPUT}"
167167
else
168168
whiptail --fb --clear --title "DockSTARTer" --msgbox "${INPUT} is not a valid port. Please try setting ${SET_VAR} again." 0 0
169169
menu_value_prompt "${SET_VAR}"
170170
fi
171171
;;
172-
"${APPNAME}_RESTART")
172+
"${APPNAME}__RESTART")
173173
case "${INPUT}" in
174174
"no" | "always" | "on-failure" | "unless-stopped")
175175
run_script 'env_set' "${SET_VAR}" "${INPUT}"
@@ -180,7 +180,7 @@ menu_value_prompt() {
180180
;;
181181
esac
182182
;;
183-
"${APPNAME}_VOLUME_"*)
183+
"${APPNAME}__VOLUME_"*)
184184
if [[ ${INPUT} == "/" ]]; then
185185
whiptail --fb --clear --title "DockSTARTer" --msgbox "Cannot use / for ${SET_VAR}. Please select another folder." 0 0
186186
menu_value_prompt "${SET_VAR}"

0 commit comments

Comments
 (0)