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

refactor(moonraker.sh): fix errors & confirms

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-01 18:39:27 +02:00
parent 491de50d8c
commit af37622a9a
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/moonraker.sh
View File

@@ -47,20 +47,18 @@ function moonraker_setup_dialog(){
### return early if moonraker already exists ### return early if moonraker already exists
if [ -n "$(moonraker_systemd)" ]; then if [ -n "$(moonraker_systemd)" ]; then
ERROR_MSG="At least one Moonraker service is already installed:" local error="At least one Moonraker service is already installed:"
for service in $(moonraker_systemd); do for service in $(moonraker_systemd); do
ERROR_MSG="${ERROR_MSG}\n ➔ ${service}" error="${error}\n ➔ ${service}"
done done
export ERROR_MSG print_error "${error}" && return
print_error && return
fi fi
### return early if python version check fails ### return early if python version check fails
if [ "$(system_check_moonraker)" == "false" ]; then if [ "$(system_check_moonraker)" == "false" ]; then
ERROR_MSG="Versioncheck failed! Python 3.7 or newer required!\n" local error="Versioncheck failed! Python 3.7 or newer required!\n"
ERROR_MSG="${ERROR_MSG} Please upgrade Python." error="${error} Please upgrade Python."
export ERROR_MSG print_error "${error}" && return
print_error && return
fi fi
top_border top_border
@@ -164,12 +162,11 @@ function moonraker_setup(){
### confirm message ### confirm message
if [[ ${instances} -eq 1 ]]; then if [[ ${instances} -eq 1 ]]; then
CONFIRM_MSG="Moonraker has been set up!" local confirm="Moonraker has been set up!"
elif [[ ${instances} -gt 1 ]]; then elif [[ ${instances} -gt 1 ]]; then
CONFIRM_MSG="${instances} Moonraker instances have been set up!" local confirm="${instances} Moonraker instances have been set up!"
fi fi
export CONFIRM_MSG print_confirm "${confirm}"
print_confirm
print_mr_ip_list "${mr_ip_list}" print_mr_ip_list "${mr_ip_list}"
return return
@@ -413,7 +410,7 @@ function remove_moonraker(){
remove_moonraker_polkit remove_moonraker_polkit
remove_moonraker_nginx remove_moonraker_nginx
confirm="Moonraker was successfully removed!" local confirm="Moonraker was successfully removed!"
print_confirm "${confirm}" && return print_confirm "${confirm}" && return
} }