- cleanup from TOTALNEW

svn-id: @836

diff --git a/rc.d/init.d/timezone b/rc.d/init.d/timezone
index b64d19d526089a6fae4e2c1c175f5ed823331e1c..b0967a1983ab4307b5df30c806fc7e1d97563214 100644 (file)
--- a/rc.d/init.d/timezone
+++ b/rc.d/init.d/timezone
@@ -5,7 +5,7 @@
 # description: This script is setting time zone information for your machine.
 # Author:      Pawel Wilk <siefca@pld.org.pl>
 #
-# $Id: timezone,v 1.5 2000/05/13 07:11:55 wiget Exp $
+# $Id: timezone,v 1.6 2000/11/16 16:04:17 baggins Exp $
 
 # NLS
 NLS_DOMAIN="rc-scripts"
@@ -18,11 +18,11 @@ NLS_DOMAIN="rc-scripts"
 
 ZONE_FILE="$ZONE_INFO_DIR"
 
-if [ "$ZONE_INFO_SCHEME" != "" ]; then
+if [ -n "$ZONE_INFO_SCHEME" ]; then
     ZONE_FILE="$ZONE_FILE/$ZONE_INFO_SCHEME"
 fi
 
-if [ "$ZONE_INFO_AREA" != "" ]; then
+if [ -n "$ZONE_INFO_AREA" ]; then
     ZONE_FILE="$ZONE_FILE/$ZONE_INFO_AREA"
 fi
 
@@ -35,17 +35,18 @@ case "$1" in
   start)
         rm -f /etc/localtime
        if [ -f "$ZONE_FILE" ]; then
-               if [ "$ZONE_INFO_AREA" != "" ]; then
+               if [ -n "$ZONE_INFO_AREA" ]; then
                    MESSAGS="`nls "Setting time zone information (%s, %s)" "$ZONE_INFO_AREA" "$TIME_ZONE"`"
-                   run_cmd "$MESSAGE" ln -s $ZONE_FILE /etc/localtime
                else
                    MESSAGE="`nls "Setting time zone information (%s)" "$TIME_ZONE"`"
-                   run_cmd "$MESSAGE" ln -s $ZONE_FILE /etc/localtime
                fi
+               run_cmd "$MESSAGE" ln -s $ZONE_FILE /etc/localtime
+               RETVAL=$?
        fi
         ;;
   stop)
            run_cmd "Unsetting time zone information" rm -f /etc/localtime
+           RETVAL=$?
         ;;
   restart)
           $0 stop
@@ -61,4 +62,7 @@ esac
 
 unset ZONE_FILE ZONE_INFO_DIR ZONE_INFO_SCHEME ZONE_INFO_AREA TIME_ZONE MESSAGE
 
-exit 0
+exit $RETVAL
+
+# This must be last line !
+# vi:syntax=sh:tw=78:ts=8:sw=4