fix: fix input validation

Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-05-22 17:34:51 +02:00
parent 19def4eac4
commit dc133053b3
2 changed files with 16 additions and 8 deletions

View File

@@ -384,14 +384,18 @@ function select_fluidd_port() {
bottom_border
local new_port re="^[0-9]+$"
while [[ ! ${new_port} =~ ${re} ]]; do
while true; do
read -p "${cyan}Please enter a new Port:${white} " new_port
if [[ ${new_port} != "${MAINSAIL_PORT}" ]] && [[ ${new_port} != "${OCTOPRINT_PORT}" ]]; then
echo "Setting port ${new_port} for Fluidd!"
if [[ ${new_port} =~ ${re} && ${new_port} != "${MAINSAIL_PORT}" && ${new_port} != "${OCTOPRINT_PORT}" ]]; then
select_msg "Setting port ${new_port} for Fluidd!"
SET_LISTEN_PORT=${new_port}
break
else
echo "That port is already taken! Select a different one!"
if [[ ! ${new_port} =~ ${re} ]]; then
error_msg "Invalid input!"
else
error_msg "Port already taken! Select a different one!"
fi
fi
done
fi