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

fix: wrong status display

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-18 17:30:18 +02:00
parent e6df33c518
commit c20fd1a79a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/octoprint.sh
View File

@@ -32,7 +32,7 @@ function octoprint_setup_dialog(){
elif [ "${klipper_count}" -gt 1 ]; then elif [ "${klipper_count}" -gt 1 ]; then
printf "|${green}%-55s${white}|\n" " ${klipper_count} Klipper instances were found!" printf "|${green}%-55s${white}|\n" " ${klipper_count} Klipper instances were found!"
else else
echo -e "| ${yellow}INFO: No existing Klipper installation found!${default} |" echo -e "| ${yellow}INFO: No existing Klipper installation found!${white} |"
fi fi
echo -e "| Usually you need one OctoPrint instance per Klipper |" echo -e "| Usually you need one OctoPrint instance per Klipper |"
echo -e "| instance. Though you can install as many as you wish. |" echo -e "| instance. Though you can install as many as you wish. |"
@@ -40,13 +40,13 @@ function octoprint_setup_dialog(){
local count local count
while [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; do while [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; do
read -p "${cyan}###### Number of OctoPrint instances to set up:${default} " count read -p "${cyan}###### Number of OctoPrint instances to set up:${white} " count
if [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; then if [[ ! (${count} =~ ^[1-9]+((0)+)?$) ]]; then
error_msg "Invalid Input!\n" error_msg "Invalid Input!\n"
else else
echo echo
while true; do while true; do
read -p "${cyan}###### Install ${count} instance(s)? (Y/n):${default} " yn read -p "${cyan}###### Install ${count} instance(s)? (Y/n):${white} " yn
case "${yn}" in case "${yn}" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
select_msg "Yes" select_msg "Yes"
@@ -284,10 +284,10 @@ function octoprint_status(){
env_count=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/OctoPrint(_[^0])?[0-9]*" | wc -w) env_count=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/OctoPrint(_[^0])?[0-9]*" | wc -w)
dir_count=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/.octoprint(_[^0])?[0-9]*" | wc -w) dir_count=$(find "${HOME}" -maxdepth 1 -regextype posix-extended -regex "${HOME}/.octoprint(_[^0])?[0-9]*" | wc -w)
if (( sf_count == env_count)) && (( sf_count == dir_count)); then if (( sf_count == 0 )) && (( env_count == 0 )) && (( dir_count == 0 )); then
status="$(printf "${green}Installed: %-5s${white}" "${sf_count}")"
elif (( sf_count == 0 )) && (( env_count == 0 )) && (( dir_count == 0 )); then
status="${red}Not installed!${white} " status="${red}Not installed!${white} "
elif (( sf_count == env_count)) && (( sf_count == dir_count)); then
status="$(printf "${green}Installed: %-5s${white}" "${sf_count}")"
else else
status="${yellow}Incomplete!${white} " status="${yellow}Incomplete!${white} "
fi fi