h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

feat: KIAUH v4.0.0 #191

Merged
dw-0 merged 453 commits from v4-rc into master 2022-05-29 20:11:16 +02:00
Conversation 8 Commits 453 Files Changed 64 +9 -10
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6902dd90db - Show all commits

13
scripts/fluidd.sh
View File

@@ -366,7 +366,6 @@ function fluidd_port_check() {
}
function select_fluidd_port() {
local new_port
if [[ ${PORT_80_BLOCKED} == "true" ]]; then
echo
top_border
@@ -377,18 +376,18 @@ function select_fluidd_port() {
[[ ${OCTOPRINT_PORT} == "80" ]] && echo "| ● OctoPrint |"
[[ ${MAINSAIL_PORT} == "80" ]] && echo "| ● Mainsail |"
blank_line
echo -e "| Make sure you don't choose a port which was already |"
echo -e "| assigned to one of the other webinterfaces and do ${red}NOT${white} |"
echo -e "| use ports in the range of 4750 or above! |"
echo -e "| Make sure you don't choose a port which is already |"
echo -e "| assigned to one of the other webinterfaces |"
blank_line
echo -e "| Be aware: there is ${red}NO${white} sanity check for the following |"
echo -e "| input. So make sure to choose a valid port! |"
bottom_border
while true; do
#TODO implement regex input validation for numbers only
local new_port re="^[0-9]+$"
while [[ ! ${new_port} =~ ${re} ]]; 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 Mainsail!"
echo "Setting port ${new_port} for Fluidd!"
SET_LISTEN_PORT=${new_port}
break
else

6
scripts/mainsail.sh
View File

@@ -487,7 +487,6 @@ function mainsail_port_check() {
}
function select_mainsail_port() {
local new_port
if [[ ${PORT_80_BLOCKED} == "true" ]]; then
echo
top_border
@@ -505,8 +504,9 @@ function select_mainsail_port() {
echo -e "| Be aware: there is ${red}NO${white} sanity check for the following |"
echo -e "| input. So make sure to choose a valid port! |"
bottom_border
while true; do
#TODO implement regex input validation for numbers only
local new_port re="^[0-9]+$"
while [[ ! ${new_port} =~ ${re} ]]; do
read -p "${cyan}Please enter a new Port:${white} " new_port
if [[ ${new_port} != "${FLUIDD_PORT}" ]] && [[ ${new_port} != "${OCTOPRINT_PORT}" ]]; then
echo "Setting port ${new_port} for Mainsail!"