diff --git a/scripts/klipperscreen.sh b/scripts/klipperscreen.sh index 5f24b94..e7f6b0f 100644 --- a/scripts/klipperscreen.sh +++ b/scripts/klipperscreen.sh @@ -16,31 +16,19 @@ set -e #===================================================# function install_klipperscreen(){ - python3_check - if [ "${py_chk_ok}" = "true" ]; then - klipperscreen_setup - restart_klipperscreen - else - ERROR_MSG="Python 3.7 or above required!\n Please upgrade your Python version first." - print_msg && clear_msg - fi -} - -function python3_check(){ - status_msg "Your Python 3 version is: $(python3 --version)" - major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1) - minor=$(python3 --version | cut -d"." -f2) - if [ "${major}" -ge 3 ] && [ "${minor}" -ge 7 ]; then - ok_msg "Python version ok!" - py_chk_ok="true" - else - py_chk_ok="false" + ### return early if python version check fails + if [ "$(python3_check)" == "false" ]; then + local error="Versioncheck failed! Python 3.7 or newer required!\n" + error="${error} Please upgrade Python." + print_error "${error}" && return fi + klipperscreen_setup + do_action_service "restart" "KlipperScreen" } function klipperscreen_setup(){ - dep=(wget curl unzip dfu-util) - dependency_check + local dep=(wget curl unzip dfu-util) + dependency_check "${dep[@]}" status_msg "Downloading KlipperScreen ..." # force remove existing KlipperScreen dir [ -d "${KLIPPERSCREEN_DIR}" ] && rm -rf "${KLIPPERSCREEN_DIR}" @@ -74,8 +62,8 @@ function remove_klipperscreen(){ ### remove KlipperScreen service if [ -e "${SYSTEMD}/KlipperScreen.service" ]; then status_msg "Removing KlipperScreen service ..." - sudo systemctl stop KlipperScreen - sudo systemctl disable KlipperScreen + do_action_service "stop" "KlipperScreen" + do_action_service "disable" "KlipperScreen" sudo rm -f "${SYSTEMD}/KlipperScreen.service" ###reloading units sudo systemctl daemon-reload @@ -96,7 +84,7 @@ function remove_klipperscreen(){ rm -f "${KLIPPER_CONFIG}/KlipperScreen.log" && ok_msg "File removed!" fi - CONFIRM_MSG="KlipperScreen successfully removed!" + print_confirm "KlipperScreen successfully removed!" } #===================================================# @@ -104,7 +92,7 @@ function remove_klipperscreen(){ #===================================================# function update_klipperscreen(){ - stop_klipperscreen + do_action_service "stop" "KlipperScreen" cd "${KLIPPERSCREEN_DIR}" KLIPPERSCREEN_OLDREQ_MD5SUM=$(md5sum "${KLIPPERSCREEN_DIR}/scripts/KlipperScreen-requirements.txt" | cut -d " " -f1) git pull origin master -q && ok_msg "Fetch successfull!" @@ -117,7 +105,7 @@ function update_klipperscreen(){ ok_msg "Dependencies have been installed!" fi ok_msg "Update complete!" - start_klipperscreen + do_action_service "start" "KlipperScreen" } #===================================================# diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh index 27c6362..a315965 100644 --- a/scripts/moonraker.sh +++ b/scripts/moonraker.sh @@ -15,19 +15,6 @@ set -e #================ INSTALL MOONRAKER ================# #===================================================# -function system_check_moonraker(){ - local major minor - ### python 3 check - status_msg "Your Python 3 version is: $(python3 --version)" - major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1) - minor=$(python3 --version | cut -d"." -f2) - if [ "${major}" -ge 3 ] && [ "${minor}" -ge 7 ]; then - echo "true" - else - echo "false" - fi -} - function moonraker_systemd() { local services services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[^0])?[0-9]*.service") @@ -47,7 +34,7 @@ function moonraker_setup_dialog(){ fi ### return early if python version check fails - if [ "$(system_check_moonraker)" == "false" ]; then + if [ "$(python3_check)" == "false" ]; then local error="Versioncheck failed! Python 3.7 or newer required!\n" error="${error} Please upgrade Python." print_error "${error}" && return diff --git a/scripts/utilities.sh b/scripts/utilities.sh index 32e8aa6..96214ab 100644 --- a/scripts/utilities.sh +++ b/scripts/utilities.sh @@ -348,36 +348,6 @@ function do_action_service(){ fi } -function start_klipperscreen(){ - status_msg "Starting KlipperScreen Service ..." - sudo systemctl start KlipperScreen && ok_msg "KlipperScreen Service started!" -} - -function stop_klipperscreen(){ - status_msg "Stopping KlipperScreen Service ..." - sudo systemctl stop KlipperScreen && ok_msg "KlipperScreen Service stopped!" -} - -function restart_klipperscreen(){ - status_msg "Restarting KlipperScreen Service ..." - sudo systemctl restart KlipperScreen && ok_msg "KlipperScreen Service restarted!" -} - -function start_MoonrakerTelegramBot(){ - status_msg "Starting MoonrakerTelegramBot Service ..." - sudo systemctl start moonraker-telegram-bot && ok_msg "MoonrakerTelegramBot Service started!" -} - -function stop_MoonrakerTelegramBot(){ - status_msg "Stopping MoonrakerTelegramBot Service ..." - sudo systemctl stop moonraker-telegram-bot && ok_msg "MoonrakerTelegramBot Service stopped!" -} - -function restart_MoonrakerTelegramBot(){ - status_msg "Restarting MoonrakerTelegramBot Service ..." - sudo systemctl restart moonraker-telegram-bot && ok_msg "MoonrakerTelegramBot Service restarted!" -} - function restart_nginx(){ if ls /lib/systemd/system/nginx.service 2>/dev/null 1>&2; then status_msg "Restarting NGINX Service ..." @@ -389,6 +359,19 @@ function restart_nginx(){ #================ DEPENDENCIES ==================# #================================================# +function python3_check(){ + local major minor + ### python 3 check + status_msg "Your Python 3 version is: $(python3 --version)" + major=$(python3 --version | cut -d" " -f2 | cut -d"." -f1) + minor=$(python3 --version | cut -d"." -f2) + if [ "${major}" -ge 3 ] && [ "${minor}" -ge 7 ]; then + echo "true" + else + echo "false" + fi +} + function dependency_check(){ local dep=( "${@}" ) # dep: array status_msg "Checking for the following dependencies:"