- cleaning

Changed files:
    netatalk.init -> 1.2

1 files changed, 47 insertions, 40 deletions

diff --git a/netatalk.init b/netatalk.init
index 28a5002..4692022 100644
--- a/netatalk.init
+++ b/netatalk.init
@@ -1,9 +1,9 @@
 #! /bin/sh
-# chkconfig: 345 91 35
-# description: This package enables Linux to talk to Macintosh
-#              computers via the AppleTalk networking protocol and 
-#              provides printer, file sharing, and AppleTalk routing 
-#              services.   
+# chkconfig:	345 91 35
+# description:	This package enables Linux to talk to Macintosh
+#		computers via the AppleTalk networking protocol and 
+#		provides printer, file sharing, and AppleTalk routing 
+#		services. 
 #
 # AppleTalk daemons. Make sure not to start atalkd in the background:
 # its data structures must have time to stablize before running the
@@ -25,7 +25,15 @@
 . /etc/sysconfig/netatalk
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network ]; then
+		# nls "ERROR: Networking is down. %s can't be run." <service>
+		msg_network_down "AppleTalk"
+		exit 1
+	fi
+else
+	exit 0
+fi
 
 # initialize return values
 RETVAL=1
@@ -35,91 +43,90 @@ RETVAL_AFPD=0
 
 # startup code for everything
 case "$1" in
-'start')
-
+  start)
 	if [ -f /var/lock/subsys/atalk ]; then
-                msg_Already_Running "AppleTalk services"
-                exit 1
-        fi
+		msg_already_running "AppleTalk"
+		exit 1
+	fi
 
-	if [ x"${ATALKD_RUN}" != x"no" ]; then 
+	if is_no "${ATALKD_RUN}"; then 
 		msg_starting "atalkd"
 		daemon atalkd
 		RETVAL_ATALKD=$?
-		action "Registering ${ATALK_NAME}:Workstation${ATALK_ZONE}:" nbprgstr -p 4 \"${ATALK_NAME}:Workstation${ATALK_ZONE}\"
-		action "Registering ${ATALK_NAME}:netatalk${ATALK_ZONE}:" nbprgstr -p 4 \"${ATALK_NAME}:netatalk${ATALK_ZONE}\"
-		if [ x"${PAPD_RUN}" = x"yes" ]; then
-	    		msg_starting "papd"
-	    		daemon papd
-	    		RETVAL_PAPD=$?
+		run_cmd $(nls "Registering %s" "${ATALK_NAME}:Workstation${ATALK_ZONE}:") "nbprgstr -p 4 \"${ATALK_NAME}:Workstation${ATALK_ZONE}\""
+		run_cmd $(nls "Registering %s" "${ATALK_NAME}:netatalk${ATALK_ZONE}:") "nbprgstr -p 4 \"${ATALK_NAME}:netatalk${ATALK_ZONE}\""
+		if is_yes "${PAPD_RUN}"; then
+			msg_starting "papd"
+			daemon papd
+			RETVAL_PAPD=$?
 		fi
 	fi
 
-	if [ x"${TIMELORD_RUN}" = x"yes" ]; then
+	if is_yes "${TIMELORD_RUN}"; then
 		msg_starting "timelord"
 		daemon timelord
 	fi
 
-	if [ x"${AFPD_RUN}" = x"yes" ] ; then
+	if is_yes "${AFPD_RUN}"; then
 		msg_starting "afpd"
-	    	daemon afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}${ATALK_ZONE}\"
-	    	RETVAL_AFPD=$?
-    	fi
+		daemon afpd ${AFPD_UAMLIST} -g ${AFPD_GUEST} -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}${ATALK_ZONE}\"
+		RETVAL_AFPD=$?
+	fi
 
-    	if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ]; then
-        	RETVAL=0
+	if [ "$RETVAL_ATALKD" -eq 0 -a "$RETVAL_PAPD" -eq 0 -a "$RETVAL_AFPD" -eq 0 ]; then
+	RETVAL=0
 	touch /var/lock/subsys/atalk || RETVAL=1
 	fi
 	;;
 
-'stop')
+  stop)
 	if [ ! -f /var/lock/subsys/atalk ]; then
-		msg_Not_Running "AppleTalk services"
+		msg_not_running "AppleTalk"
 		exit 1
 	fi
 
-	if [ x"${ATALKD_RUN}" != x"no" ]; then
-		if [ x"${PAPD_RUN}" = x"yes" ]; then
+	if is_no "${ATALKD_RUN}"; then
+		if is_yes "${PAPD_RUN}"; then
 			msg_stopping "papd"
 			killproc papd
 			RETVAL_PAPD=$?
-	    	fi
+		fi
 
-		if [ x"${TIMELORD_RUN}" = x"yes" ]; then
+		if is_yes "${TIMELORD_RUN}"; then
 			msg_stopping "timelord"
 			killproc timelord
 		fi
 
-		action "Unregistering ${ATALK_NAME}:Workstation${ATALK_ZONE}:" nbpunrgstr \"${ATALK_NAME}:Workstation${ATALK_ZONE}\"
-		action "Unregistering ${ATALK_NAME}:netatalk${ATALK_ZONE}:" nbpunrgstr \"${ATALK_NAME}:netatalk${ATALK_ZONE}\"
+		run_cmd $(nls "Unregistering %s" "${ATALK_NAME}:Workstation${ATALK_ZONE}:") "nbpunrgstr \"${ATALK_NAME}:Workstation${ATALK_ZONE}\""
+		run_cmd $(nls "Unregistering %s" "${ATALK_NAME}:netatalk${ATALK_ZONE}:") "nbpunrgstr \"${ATALK_NAME}:netatalk${ATALK_ZONE}\""
 
 		msg_stopping "atalk"
-	    	killproc atalkd
-	    	RETVAL_ATALKD=$?
+		killproc atalkd
+		RETVAL_ATALKD=$?
 	fi
 
-	if [ x"${AFPD_RUN}" = x"yes" ]; then
+	if [ is_yes "${AFPD_RUN}"; then
 		msg_stopping "afpd"
 		killproc afpd
 		RETVAL_AFPD=$?
 	fi
 
-	if [ $RETVAL_ATALKD -eq 0 -a $RETVAL_PAPD -eq 0 -a $RETVAL_AFPD -eq 0 ] ; then
+	if [ "$RETVAL_ATALKD" -eq 0 -a "$RETVAL_PAPD" -eq 0 -a "$RETVAL_AFPD" -eq 0 ]; then
 		RETVAL=0
 		rm -f /var/lock/subsys/atalk || RETVAL=1
 	fi
 	;;
-  'restart'|'reload')
+  restart|reload)
 	$0 stop
 	$0 start
 	RETVAL=$?
 	;;
-  'status')
+  status)
 	status atalkd
 	RETVAL=$?
 	;;
   *)
-	echo "Usage: atalk {start|stop|restart|status}"
+	msg_usage "$0 {start|stop|restart|reload|status}"
 	exit 1
 esac