Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ds getting false positives for special variables #1783

Merged
merged 2 commits into from
Sep 11, 2024
Merged

fix: ds getting false positives for special variables #1783

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea0dd04
fix: `ds` getting false positives for special variables
CLHatch Sep 8, 2024
b1fa6ea
Update menu_value_prompt.sh
CLHatch Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .scripts/menu_value_prompt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -142,15 +142,15 @@ 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
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
;;
*_NETWORK_MODE)
"${APPNAME}_NETWORK_MODE")
case "${INPUT}" in
"" | "bridge" | "host" | "none" | "service:"* | "container:"*)
run_script 'env_set' "${SET_VAR}" "${INPUT}"
Expand All @@ -161,15 +161,15 @@ 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
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
;;
*_RESTART)
"${APPNAME}_RESTART")
case "${INPUT}" in
"no" | "always" | "on-failure" | "unless-stopped")
run_script 'env_set' "${SET_VAR}" "${INPUT}"
Expand All @@ -180,7 +180,7 @@ 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}"
Expand Down