From: Sebastien Estienne Date: Thu, 30 Jun 2005 11:35:44 +0000 (+0000) Subject: renamed debian/gentoo initscript to remove .in, not needed anymore X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=bff096ce462751845bf0a7790a5f55cd0d9069e7;p=catta renamed debian/gentoo initscript to remove .in, not needed anymore install gentoo initscript in /etc/init.d git-svn-id: file:///home/lennart/svn/public/avahi/trunk@156 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- diff --git a/configure.ac b/configure.ac index a141ad6..1cedd10 100644 --- a/configure.ac +++ b/configure.ac @@ -235,9 +235,7 @@ avahi-discover/Makefile avahi-client/Makefile initscript/Makefile initscript/Debian/Makefile -initscript/Debian/75avahi initscript/Gentoo/Makefile -initscript/Gentoo/avahi avahi-dnsconfd/Makefile ]) AC_OUTPUT diff --git a/initscript/Debian/75avahi b/initscript/Debian/75avahi new file mode 100755 index 0000000..00d8fb6 --- /dev/null +++ b/initscript/Debian/75avahi @@ -0,0 +1,121 @@ +#! /bin/sh +# +# avahi avahi daemon +# Daemon for ZeroConf +# +# Authors: +# + +if [ -f /lib/lsb/init-functions ] +then + . /lib/lsb/init-functions +else + # int log_begin_message (char *message) + log_begin_msg () { + if [ -z "$1" ]; then + return 1 + fi + echo " * $@" + } + + # int log_end_message (int exitstatus) + log_end_msg () { + + # If no arguments were passed, return + [ -z "$1" ] && return 1 + + # Only do the fancy stuff if we have an appropriate terminal + # and if /usr is already mounted + TPUT=/usr/bin/tput + EXPR=/usr/bin/expr + if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then + COLS=`$TPUT cols` + if [ -n "$COLS" ]; then + COL=`$EXPR $COLS - 7` + else + COL=73 + fi + UP=`$TPUT cuu1` + END=`$TPUT hpa $COL` + START=`$TPUT hpa 0` + RED=`$TPUT setaf 1` + NORMAL=`$TPUT op` + if [ $1 -eq 0 ]; then + echo "$UP$END[ ok ]" + else + echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]" + fi + else + if [ $1 -eq 0 ]; then + echo " ...done." + else + echo " ...fail!" + fi + fi + return $1 + } + +fi + +#set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DESC="Avahi ZeroConf daemon" +NAME="avahi" +DAEMON=/usr/bin/$NAME + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# +# Function that starts the daemon/service. +# +d_start() { + $DAEMON -D +} + +# +# Function that stops the daemon/service. +# +d_stop() { + $DAEMON -k || /bin/true +} + +# +# Function that reload the config file for the daemon/service. +# +d_reload() { + $DAEMON -r +} + + +case "$1" in + start) + log_begin_msg "Starting $DESC: $NAME" + d_start + log_end_msg $? + ;; + stop) + log_begin_msg "Stopping $DESC: $NAME" + d_stop + log_end_msg $? + ;; + reload) + log_begin_msg "Reloading config file for $DESC: $NAME" + d_reload + log_end_msg $? + ;; + restart|force-reload) + log_begin_msg "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + log_end_msg $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/initscript/Debian/75avahi.in b/initscript/Debian/75avahi.in deleted file mode 100755 index 00d8fb6..0000000 --- a/initscript/Debian/75avahi.in +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh -# -# avahi avahi daemon -# Daemon for ZeroConf -# -# Authors: -# - -if [ -f /lib/lsb/init-functions ] -then - . /lib/lsb/init-functions -else - # int log_begin_message (char *message) - log_begin_msg () { - if [ -z "$1" ]; then - return 1 - fi - echo " * $@" - } - - # int log_end_message (int exitstatus) - log_end_msg () { - - # If no arguments were passed, return - [ -z "$1" ] && return 1 - - # Only do the fancy stuff if we have an appropriate terminal - # and if /usr is already mounted - TPUT=/usr/bin/tput - EXPR=/usr/bin/expr - if [ -x $TPUT ] && [ -x $EXPR ] && $TPUT hpa 60 >/dev/null 2>&1; then - COLS=`$TPUT cols` - if [ -n "$COLS" ]; then - COL=`$EXPR $COLS - 7` - else - COL=73 - fi - UP=`$TPUT cuu1` - END=`$TPUT hpa $COL` - START=`$TPUT hpa 0` - RED=`$TPUT setaf 1` - NORMAL=`$TPUT op` - if [ $1 -eq 0 ]; then - echo "$UP$END[ ok ]" - else - echo -e "$UP$START $RED*$NORMAL$END[${RED}fail${NORMAL}]" - fi - else - if [ $1 -eq 0 ]; then - echo " ...done." - else - echo " ...fail!" - fi - fi - return $1 - } - -fi - -#set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="Avahi ZeroConf daemon" -NAME="avahi" -DAEMON=/usr/bin/$NAME - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# -# Function that starts the daemon/service. -# -d_start() { - $DAEMON -D -} - -# -# Function that stops the daemon/service. -# -d_stop() { - $DAEMON -k || /bin/true -} - -# -# Function that reload the config file for the daemon/service. -# -d_reload() { - $DAEMON -r -} - - -case "$1" in - start) - log_begin_msg "Starting $DESC: $NAME" - d_start - log_end_msg $? - ;; - stop) - log_begin_msg "Stopping $DESC: $NAME" - d_stop - log_end_msg $? - ;; - reload) - log_begin_msg "Reloading config file for $DESC: $NAME" - d_reload - log_end_msg $? - ;; - restart|force-reload) - log_begin_msg "Restarting $DESC: $NAME" - d_stop - sleep 1 - d_start - log_end_msg $? - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am index 9d95673..7e9abf5 100644 --- a/initscript/Gentoo/Makefile.am +++ b/initscript/Gentoo/Makefile.am @@ -1,4 +1,4 @@ -dbusinitddir = $(sysconfdir)/dbus-1/system.d +dbusinitddir = $(sysconfdir)/init.d dbusinitd_SCRIPTS = avahi EXTRA_DIST = $(dbusinitd_SCRIPTS) diff --git a/initscript/Gentoo/avahi b/initscript/Gentoo/avahi new file mode 100644 index 0000000..a37c965 --- /dev/null +++ b/initscript/Gentoo/avahi @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Avahi ZeroConf Daemon init script +# Many thanks to the Avahi developer's and Sebastien Estienne + +DAEMON=/usr/bin/avahi + +depend () { + need dbus +} + +start() { + ebegin "Starting avahi" + $DAEMON -D + eend $? +} + +stop() { + ebegin "Stopping avahi" + $DAEMON -k || /bin/true + eend $? +} + +reload() { + ebegin "Reloading avahi configuration" + $DAEMON -r + eend $? +} + diff --git a/initscript/Gentoo/avahi.in b/initscript/Gentoo/avahi.in deleted file mode 100644 index a37c965..0000000 --- a/initscript/Gentoo/avahi.in +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/runscript -# Avahi ZeroConf Daemon init script -# Many thanks to the Avahi developer's and Sebastien Estienne - -DAEMON=/usr/bin/avahi - -depend () { - need dbus -} - -start() { - ebegin "Starting avahi" - $DAEMON -D - eend $? -} - -stop() { - ebegin "Stopping avahi" - $DAEMON -k || /bin/true - eend $? -} - -reload() { - ebegin "Reloading avahi configuration" - $DAEMON -r - eend $? -} -