From f46b099b74991ee9a917513bbaf4e043f45f885f Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Sat, 3 Sep 2022 14:14:37 +0200
Subject: [PATCH] refactor(klipper): more verbose error message if SysVinit
 script is detected

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
---
 scripts/klipper.sh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/scripts/klipper.sh b/scripts/klipper.sh
index f6b93d0..0ce70bc 100644
--- a/scripts/klipper.sh
+++ b/scripts/klipper.sh
@@ -28,33 +28,35 @@ function klipper_systemd() {
   echo "${services}"
 }
 
-function klipper_exists() {
-  local services
-  [[ -n $(klipper_initd) ]] && services+="$(klipper_initd) "
-  [[ -n $(klipper_systemd) ]] && services+="$(klipper_systemd)"
-  echo "${services}"
-}
-
 function klipper_setup_dialog() {
   status_msg "Initializing Klipper installation ..."
 
-  local klipper_services
+  local klipper_initd_service
+  local klipper_systemd_services
   local python_version="${1}" user_input=()
-  klipper_services=$(klipper_exists)
+  local error
+
+  klipper_initd_service=$(klipper_initd)
+  klipper_systemd_services=$(klipper_systemd)
   user_input+=("${python_version}")
 
   ### return early if klipper already exists
-  if [[ -n ${klipper_services} ]]; then
-    local error="At least one Klipper service is already installed:"
+  if [[ -n ${klipper_initd_service} ]]; then
+    error="Unsupported Klipper SysVinit service detected:"
+    error="${error}\n ➔ ${klipper_initd_service}"
+    error="${error}\n Please re-install Klipper with KIAUH!"
+    log_info "Unsupported Klipper SysVinit service detected: ${klipper_initd_service}"
+  elif [[ -n ${klipper_systemd_services} ]]; then
+    error="At least one Klipper service is already installed:"
 
-    for s in ${klipper_services}; do
+    for s in ${klipper_systemd_services}; do
       log_info "Found Klipper service: ${s}"
       error="${error}\n ➔ ${s}"
     done
-
-    print_error "${error}" && return
   fi
 
+  [[ -n ${error} ]] && print_error "${error}" && return
+
   ### ask for amount of instances to create
   top_border
   echo -e "| Please select the number of Klipper instances to set  |"