diff --git a/warden3/contrib/warden_filer/warden_filer_receiver b/warden3/contrib/warden_filer/warden_filer_receiver old mode 100755 new mode 100644 index a0ded37854847a3368cb7a3493a62b8033aa3fe8..4ecebfbc745de43e207f305b8866dd872a0960d3 --- a/warden3/contrib/warden_filer/warden_filer_receiver +++ b/warden3/contrib/warden_filer/warden_filer_receiver @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ### BEGIN INIT INFO # Provides: warden_filer_receiver @@ -18,8 +18,17 @@ SERVICE_NAME="${DAEMON_NAME}_${FUNC}" PID=/var/run/"$DAEMON_NAME"/"$FUNC".pid CONFIG=/etc/"$DAEMON_NAME".cfg -test -f /etc/default/"$SERVICE_NAME" && . /etc/default/"$SERVICE_NAME" -. /lib/lsb/init-functions +# Try Debian & Fedora/RHEL/Suse sysconfig +for n in default sysconfig; do + [ -f /etc/$n/"$SERVICE_NAME" ] && . /etc/$n/"$SERVICE_NAME" +done + +# Fallback +function log_daemon_msg () { echo -n "$@"; } +function log_end_msg () { [ $1 -eq 0 ] && echo " OK" || echo " Failed"; } +function status_of_proc () { [ -f "$PID" ] && ps u -p $(<"$PID") || echo "$PID not found."; } + +[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions ACTION="$1" diff --git a/warden3/contrib/warden_filer/warden_filer_sender b/warden3/contrib/warden_filer/warden_filer_sender old mode 100755 new mode 100644 index 725eafa075dba4592ef28cea0730df837329b388..358c3fe0ed38d8421561e46cc9b6ee134fd3f1d1 --- a/warden3/contrib/warden_filer/warden_filer_sender +++ b/warden3/contrib/warden_filer/warden_filer_sender @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ### BEGIN INIT INFO # Provides: warden_filer_sender @@ -18,8 +18,17 @@ SERVICE_NAME="${DAEMON_NAME}_${FUNC}" PID=/var/run/"$DAEMON_NAME"/"$FUNC".pid CONFIG=/etc/"$DAEMON_NAME".cfg -test -f /etc/default/"$SERVICE_NAME" && . /etc/default/"$SERVICE_NAME" -. /lib/lsb/init-functions +# Try Debian & Fedora/RHEL/Suse sysconfig +for n in default sysconfig; do + [ -f /etc/$n/"$SERVICE_NAME" ] && . /etc/$n/"$SERVICE_NAME" +done + +# Fallback +function log_daemon_msg () { echo -n "$@"; } +function log_end_msg () { [ $1 -eq 0 ] && echo " OK" || echo " Failed"; } +function status_of_proc () { [ -f "$PID" ] && ps u -p $(<"$PID") || echo "$PID not found."; } + +[ -f /lib/lsb/init-functions ] && . /lib/lsb/init-functions ACTION="$1"