From 8878b8a2fc0965cf944bb9b414e6ce73deba8dd8 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 19 May 2022 09:56:51 +0200 Subject: [PATCH] refactor(klipperscreen.sh): exit if cloning and installing klipperscreen failed Signed-off-by: Dominik Willner th33xitus@gmail.com --- scripts/klipperscreen.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/klipperscreen.sh b/scripts/klipperscreen.sh index f05f3ea..5459738 100644 --- a/scripts/klipperscreen.sh +++ b/scripts/klipperscreen.sh @@ -41,17 +41,24 @@ function install_klipperscreen() { function klipperscreen_setup() { local dep=(wget curl unzip dfu-util) dependency_check "${dep[@]}" - status_msg "Downloading KlipperScreen ..." + status_msg "Cloning KlipperScreen from ${KLIPPERSCREEN_REPO} ..." # force remove existing KlipperScreen dir [[ -d ${KLIPPERSCREEN_DIR} ]] && rm -rf "${KLIPPERSCREEN_DIR}" # clone into fresh KlipperScreen dir - cd "${HOME}" && git clone "${KLIPPERSCREEN_REPO}" - ok_msg "Download complete!" + if ! git clone "${KLIPPERSCREEN_REPO}" "${KLIPPERSCREEN_DIR}"; then + print_error "Cloning KlipperScreen from\n ${KLIPPERSCREEN_REPO}\n failed!" + exit 1 + fi + status_msg "Installing KlipperScreen ..." - "${KLIPPERSCREEN_DIR}"/scripts/KlipperScreen-install.sh - ok_msg "KlipperScreen successfully installed!" + if "${KLIPPERSCREEN_DIR}"/scripts/KlipperScreen-install.sh; then + ok_msg "KlipperScreen successfully installed!" + else + print_error "KlipperScreen installation failed!" + exit 1 + fi } #===================================================# @@ -132,7 +139,7 @@ function get_klipperscreen_status() { ### remove the "SERVICE" entry from the data array if a moonraker service is installed local data_arr=(SERVICE "${KLIPPERSCREEN_DIR}" "${KLIPPERSCREEN_ENV}") - (( sf_count > 0)) && unset "data_arr[0]" + (( sf_count > 0 )) && unset "data_arr[0]" ### count+1 for each found data-item from array local filecount=0