Fix error in determin systemd support for debian 13 and newer.

add-new-account.sh

@@ -298,9 +298,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

add_missing_columns.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

add_missing_indices.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

add_missing_primary-keys.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

add_user_to_group.sh

@@ -234,9 +234,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

check_cert_coolwsd.sh

@@ -145,12 +145,12 @@ fi
 
 # - Systemd supported ?
 # -
-systemd_supported=false
+SYSTEMD_EXISTS=false
 systemd=$(which systemd)
 systemctl=$(which systemctl)
 
-if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
-   systemd_supported=true
+   SYSTEMD_EXISTS=true
 fi
 
 
@@ -382,7 +382,7 @@ if ! diff "$(realpath "$cert_installed")" "$(realpath "$cert_newest")" > /dev/nu
       # -
 		echo ""
 		echononl "   Restart Service '$SERVICE_NAME'.."
-      if $systemd_supported ; then
+      if $SYSTEMD_EXISTS ; then
 
          systemctl restart "$SERVICE_NAME" > $log_file 2>&1
 

check_cert_loolwsd.sh

@@ -145,12 +145,12 @@ fi
 
 # - Systemd supported ?
 # -
-systemd_supported=false
+SYSTEMD_EXISTS=false
 systemd=$(which systemd)
 systemctl=$(which systemctl)
 
-if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
-   systemd_supported=true
+   SYSTEMD_EXISTS=true
 fi
 
 
@@ -382,7 +382,7 @@ if ! diff "$(realpath "$cert_installed")" "$(realpath "$cert_newest")" > /dev/nu
       # -
 		echo ""
 		echononl "   Restart Service '$SERVICE_NAME'.."
-      if $systemd_supported ; then
+      if $SYSTEMD_EXISTS ; then
 
          systemctl restart loolwsd > $log_file 2>&1
 

check_encryption_scan_legacy-format.sh

@@ -204,9 +204,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

check_for_old_files.sh

@@ -204,9 +204,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

convert_filecache_bigint.sh

@@ -204,9 +204,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

install_apps.sh

@@ -267,9 +267,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_file_scan_all_accounts.sh

@@ -275,9 +275,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_file_scan_app-data.sh

@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_maintenance.sh

@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_manual_upgrade.sh

@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_migrate_mimetipes.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

occ_update_apps.sh

@@ -282,9 +282,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

reinstall-notify_push.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

remove-app_api.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

remove-old-nc-installations.sh

@@ -201,9 +201,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

remove_user_from_group.sh

@@ -234,9 +234,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

replace_favicon.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

replace_logo.sh

@@ -196,9 +196,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

restore_nextcloud.sh

@@ -201,9 +201,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi
 

update_nextcloud.sh

@@ -301,9 +301,11 @@ IFS=$CUR_IFS
 
 # - Support systemd ?
 # -
-if [[ "X$(which systemd)" = "X" ]]; then
 SYSTEMD_EXISTS=false
-else
+systemd=$(which systemd)
+systemctl=$(which systemctl)
+
+if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
    SYSTEMD_EXISTS=true
 fi