Changeset cb45bc1 in freewrt

Timestamp:

Jun 26, 2007, 8:47:14 PM (18 years ago)

Author:

Christian Fischer <spaetzle@…>

Children:

b7c164d

Parents:

34bf5b5

Message:

some fixes to make shell code portable

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2945 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/fwifupdown/files

Files:

• ifupdown.sh (modified) (1 diff)
• main.sh (modified) (17 diffs)

package/fwifupdown/files/ifupdown.sh

@@ -8 +8 @@
 #
 
-what=$(basename $0)
+what=${0##*/}
 case $what in
 ifup)

package/fwifupdown/files/main.sh

@@ -36 +36 @@
 
 __exit() {
-        [ "$1" != "0" ] && echo "H_ERR=1" >> $ENVFILE
+        [ x"$1" != x"0" ] && echo "RT_ERR=1" >> $ENVFILE
         exit $1
 }
@@ -61 +61 @@
 
 main_env_update() {
-        local t_mdent lastmatch=""
+        local t_mdent lastmatch=
 
         # get submode from calling hook script
-        SUBMODE=$(dirname $0|sed '{ s/\(.*\/\)*//; s/\.d$//}')
+        SUBMODE=$(echo ${0%/*} |sed '{ s/\(.*\/\)*//; s/\.d$//}')
 
         # create env file
         if ! [ -f "$ENVFILE" ]
         then
-                [ -d $(dirname $ENVFILE) ] || mkdir -p $(dirname $ENVFILE)
+                [ -d ${ENVFILE%/*} ] || mkdir -p ${ENVFILE%/*}
                 echo "MDENT=0" >> $ENVFILE
                 echo "LASTLOG=0" >> $ENVFILE
 
-                if is_up
-                then
-                        IFACE_STATE="up"
-                else
-                        IFACE_STATE="down"
-                fi
+                is_up && IFACE_STATE="up" || IFACE_STATE="down"
                 echo "IFACE_STATE=$IFACE_STATE" >> $ENVFILE
 
-                if [ "$IFACE" != "lo" ]
+                if [ x"$IFACE" != x"lo" ]
                 then
                         # search for existing lib files end evaluate iface type by using the appropriate
@@ -87 +82 @@
                         for lib in ${LIBDIR}/iftypes/*
                         do
-                                if [ -f $lib ]
+                                [ -f $lib ] && (. $lib; iface_type 2>&-) || continue
+                                if [ -n "$lastmatch" ]
                                 then
-                                        if (. $lib; iface_type 2>&-)
+                                        if [ ${lib##*/} = ${lastmatch##*/} ]
                                         then
-                                                if [ "$lastmatch" != "" ]
-                                                then
-                                                        if [ "$(basename $lib)" = "$(basename $lastmatch)" ]
-                                                        then
-                                                                mprint -s "Warning: $lib overlays $lastmatch"
-                                                        else
-                                                                mprint -s "Error: iface type $lib overlays $lastmatch"
-                                                        fi
-                                                fi
-                                                lastmatch=$lib
+                                                mprint -s "Warning: $lib overlays $lastmatch"
+                                        else
+                                                mprint -s "Error: iface type $lib overlays $lastmatch"
                                         fi
                                 fi
+                                lastmatch=$lib
                         done
                 fi
 
-                if [ "$lastmatch" != "" ]
-                then
-                        IFACE_TYPE=$(basename $lastmatch)
-                else
-                        # if iface type isn't evaluated type "iface" is default
-                        IFACE_TYPE="iface"
-                fi
+                # if iface type isn't evaluated type "iface" is default
+                [ -n "$lastmatch" ] && IFACE_TYPE=${lastmatch##*/} || IFACE_TYPE="iface"
 
                 # update env
@@ -131 +116 @@
 
 main_pos_update() {
-        if [ "${MDENT:-0}" = "0" ]
-        then
-                STARTCOL=""
-        else
-                STARTCOL="[$(expr ${MDENT:-0} \* ${TAB})C"
-        fi
+        [ x"$MDENT" = x"0" ] && STARTCOL= || STARTCOL="[$(expr ${MDENT:-0} \* ${TAB})C"
         sed 's/MDENT=[0-9]*/'MDENT=$MDENT'/' -i $ENVFILE
 }
@@ -157 +137 @@
         retval=$?
 
-        if [ $retval != 0 ]
-        then
-                if [ $retval != 127 ]
-                then
-                        fail_preup 2>&- || exit 1
-                fi
-        fi
+        [ x"$retval" != x"0" -a x"$retval" != x"127" ] && {
+                fail_preup 2>&- || exit 1
+        }
 
         config $RT_PREUP_PRINTING_OFF || mup
@@ -174 +150 @@
                 retval=$?
 
-                if [ $retval != 0 ]
+                if [ x"$retval" != x"0" ]
                 then
 
@@ -191 +167 @@
         retval=$?
 
-        if [ $retval != 0 ]
-        then
-                if [ $retval != 127 ]
-                then
-                        fail_up 2>&- || exit 1
-                fi
-        fi
+        [ x"$retval" != x"0" -a x"$retval" != x"127" ] && {
+                fail_up 2>&- || exit 1
+        }
 
         if [ -d /tmp/ifupdown/pcode/${IFACE} ]
@@ -203 +175 @@
                 for dir in /tmp/ifupdown/pcode/${IFACE}/*
                 do
-                        if [ -f ${dir}/postup ]
-                        then
-                                . ${dir}/postup
-                        fi
+                        [ -f ${dir}/postup ] || continue
+                        . ${dir}/postup
                 done
         fi
@@ -218 +188 @@
                 for dir in /tmp/ifupdown/pcode/${IFACE}/*
                 do
-                        if [ -f ${dir}/predown ]
-                        then
-                                . ${dir}/predown
-                        fi
+                        [ -f ${dir}/predown ] || continue
+                        . ${dir}/predown
                 done
         fi
@@ -228 +196 @@
         retval=$?
 
-        if [ $retval != 0 ]
-        then
-                if [ $retval != 127 ]
-                then
-                        fail_down 2>&- || exit 1
-                fi
-        fi
+        [ x"$retval" != x"0" -a x"$retval" != x"127" ] && {
+                fail_down 2>&- || exit 1
+        }
 
         config $RT_DOWN_PRINTING_OFF || mdown
@@ -268 +232 @@
         retval=$?
 
-        if [ $retval != 0 ]
-        then
-                if [ $retval != 127 ]
-                then
-                        fail_postdown 2>&- || exit 1
-                fi
-        fi
+        [ x"$retval" != x"0" -a  x"$retval" != x"127" ] && {
+                fail_postdown 2>&- || exit 1
+        }
 
         # pcode cleanup
@@ -283 +243 @@
         for hook in ${LIBDIR}/${1}/${2}
         do
-                if [ -f $hook ]
-                then
-                        . $hook
-                        eval $3 2>&-
-                        retval=$?
-                        [ $retval != 0 -a $retval != 127 ] && exit 1
-                        return
-                fi
+                [ -f $hook ] || continue
+                . $hook
+                eval $3 2>&-
+                retval=$?
+                [ x"$retval" != x"0" -a x"$retval" != x"127" ] && exit 1
+                return
         done
 }
@@ -300 +258 @@
                 eval "${plugin##*/}_${1}" 2>&-
                 retval=$?
-                [ $retval != 0 -a $retval != 127 ] && exit 1
+                [ x"$retval" != x"0" -a x"$retval" != x"127" ] && exit 1
         done
 }
@@ -307 +265 @@
         case $SUBMODE in
                 if-pre-up)
-                        [ "${IF_PRE_UP:-""}" != "" ] && eval $IF_PRE_UP
+                        [ -n "$IF_PRE_UP" ] && eval $IF_PRE_UP
                 ;;
                 if-up)
-                        [ "${IF_UP:-""}" != "" ] && eval $IF_UP
+                        [ -n "$IF_UP" ] && eval $IF_UP
                 ;;
                 if-down)
-                        [ "${IF_DOWN:-""}" != "" ] && eval $IF_DOWN
+                        [ -n "$IF_DOWN" ] && eval $IF_DOWN
                 ;;
                 if-post-down)
-                        [ "${IF_POST_DOWN:-""}" != "" ] && eval $IF_POST_DOWN
+                        [ -n "$IF_POST_DOWN" ] && eval $IF_POST_DOWN
                 ;;
         esac
@@ -330 +288 @@
 . /etc/rc.conf
 
-config ${FWIFUPDOWN_DEBUG:=""} && set -x
+config $FWIFUPDOWN_DEBUG && set -x
 
 RT_PREUP_PRINTING_OFF=0
@@ -340 +298 @@
 RT_POSTDOWN_IFDOWN_CHECK_OFF=0
 RT_BB_NOEXEC=0
+RT_ERR=0
 readonly ENVFILE="/tmp/ifupdown/env"
-readonly INSTALLDIR="/lib/network"
 readonly LIBDIR="/etc/network"
 IFACE_TYPE="none"
-H_ERR=0
 
 alias exit="__exit"
 alias ifup="__ifupdown ifup"
 alias ifdown="__ifupdown ifdown"
-[ -z "${KSH_VERSION:-""}" ] || alias which='whence -p'
+[ -z "$KSH_VERSION" ] || alias which='whence -p'
 
 if ! [ -f /etc/network/mfunctions.sh ]
@@ -360 +317 @@
 main_env_update
 
-config $H_ERR && built_in exit 1
-
-if [ "$IFACE_TYPE" != "iface" ]
+config $RT_ERR && built_in exit 1
+
+if [ x"$IFACE_TYPE" != x"iface" ]
 then
         if [ -f "${LIBDIR}/iftypes/${IFACE_TYPE}" ]