Fix error in determin systemd support for debian 13 and newer.
This commit is contained in:
@@ -298,16 +298,18 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# - Running in a terminal?
|
# - Running in a terminal?
|
||||||
# -
|
# -
|
||||||
if [[ -t 1 ]] ; then
|
if [[ -t 1 ]] ; then
|
||||||
terminal=true
|
terminal=true
|
||||||
else
|
else
|
||||||
terminal=false
|
terminal=false
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -234,9 +234,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,12 +145,12 @@ fi
|
|||||||
|
|
||||||
# - Systemd supported ?
|
# - Systemd supported ?
|
||||||
# -
|
# -
|
||||||
systemd_supported=false
|
SYSTEMD_EXISTS=false
|
||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -382,7 +382,7 @@ if ! diff "$(realpath "$cert_installed")" "$(realpath "$cert_newest")" > /dev/nu
|
|||||||
# -
|
# -
|
||||||
echo ""
|
echo ""
|
||||||
echononl " Restart Service '$SERVICE_NAME'.."
|
echononl " Restart Service '$SERVICE_NAME'.."
|
||||||
if $systemd_supported ; then
|
if $SYSTEMD_EXISTS ; then
|
||||||
|
|
||||||
systemctl restart "$SERVICE_NAME" > $log_file 2>&1
|
systemctl restart "$SERVICE_NAME" > $log_file 2>&1
|
||||||
|
|
||||||
|
|||||||
@@ -145,12 +145,12 @@ fi
|
|||||||
|
|
||||||
# - Systemd supported ?
|
# - Systemd supported ?
|
||||||
# -
|
# -
|
||||||
systemd_supported=false
|
SYSTEMD_EXISTS=false
|
||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -382,7 +382,7 @@ if ! diff "$(realpath "$cert_installed")" "$(realpath "$cert_newest")" > /dev/nu
|
|||||||
# -
|
# -
|
||||||
echo ""
|
echo ""
|
||||||
echononl " Restart Service '$SERVICE_NAME'.."
|
echononl " Restart Service '$SERVICE_NAME'.."
|
||||||
if $systemd_supported ; then
|
if $SYSTEMD_EXISTS ; then
|
||||||
|
|
||||||
systemctl restart loolwsd > $log_file 2>&1
|
systemctl restart loolwsd > $log_file 2>&1
|
||||||
|
|
||||||
|
|||||||
@@ -204,9 +204,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -204,9 +204,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -204,9 +204,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -267,9 +267,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -275,9 +275,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -280,9 +280,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -282,9 +282,11 @@ CURRENT_VERSION="$(basename $INSTALL_DIR | cut -d"-" -f2)"
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -201,9 +201,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -234,9 +234,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -196,9 +196,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -201,9 +201,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -301,9 +301,11 @@ IFS=$CUR_IFS
|
|||||||
|
|
||||||
# - Support systemd ?
|
# - Support systemd ?
|
||||||
# -
|
# -
|
||||||
if [[ "X$(which systemd)" = "X" ]]; then
|
SYSTEMD_EXISTS=false
|
||||||
SYSTEMD_EXISTS=false
|
systemd=$(which systemd)
|
||||||
else
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user