Changeset 76b8726 in freewrt for package

Timestamp:

Jul 18, 2006, 2:56:53 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

ce3d5c7

Parents:

042eeb3

Message:

remove useless spaces, quoting, {...} blocks,
useless use of cat, etc.

please test

XXX the passwd and group functions could be merged

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

File:

• package/base-files/default/etc/functions.sh (modified) (7 diffs)

package/base-files/default/etc/functions.sh

@@ -4 +4 @@
 
 # valid interface?
-if_valid () (
+if_valid() (
         ifconfig "$1" >&- 2>&- ||
-        [ "${1%%[0-9]}" = "br" ] || {
-                [ "${1%%[0-9]}" = "vlan" ] && (
+        [ "${1%%[0-9]}" = br ] || {
+                [ "${1%%[0-9]}" = vlan ] && (
                         i=${1#vlan}
                         hwname=$(nvram get vlan${i}hwname)
@@ -26 +26 @@
         if_proto=$(nvram get ${2}_proto)
         if=$(nvram get ${2}_ifname)
-        [ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${2}_device)
+        [ "${if%%[0-9]}" = ppp ] && if=$(nvram get ${2}_device)
 
         pidfile=/var/run/${if}.pid
-        [ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+        [ -f $pidfile ] && $DEBUG kill $(<$pidfile)
 
         case $1 in
@@ -42 +42 @@
                 ${gateway:+$DEBUG route add default gw $gateway}
 
-                [ -n "$static_route" ] && {
-                        for route in $static_route; do {
+                [ -n "$static_route" ] && for route in $static_route; do
                         eval "set $(echo $route | sed 's/:/ /g')"
-                                if [ "$2" = "255.255.255.255" ]; then
-                                        opt="-host"
-                                fi
-                                $DEBUG route add ${opt:-"-net"} $1 netmask $2 gw $3 metric $4
-                        } done
-                }
+                        [ "$2" = "255.255.255.255" ] && opt=-host
+                        $DEBUG route add ${opt:-"-net"} $1 netmask $2 gw $3 metric $4
+                done
 
                 [ -f /etc/resolv.conf ] || {
@@ -59 +55 @@
                 }
 
-                env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" &
-        ;;
+                env -i ACTION=ifup INTERFACE="${2}" PROTO=static /sbin/hotplug iface &
+                ;;
         dhcp)
                 DHCP_IP=$(nvram get ${2}_ipaddr)
@@ -71 +67 @@
                 DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
                 [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
-                [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
-                [ -r $pidfile ] && oldpid=$(cat $pidfile 2>&-)
+                [ "$if_proto" = pptp ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
+                [ -r $pidfile ] && oldpid=$(<$pidfile)
                 ${DEBUG:-eval} "udhcpc $DHCP_ARGS"
                 [ -n "$oldpid" ] && pidof udhcpc | grep "$oldpid" >&- 2>&- && {
@@ -79 +75 @@
                 }
                 # hotplug events are handled by /usr/share/udhcpc/default.script
-        ;;
+                ;;
         none|"")
-        ;;
+                ;;
         *)
                 [ -x "/sbin/ifup.$1" ] && { $DEBUG /sbin/ifup.$1 ${2}; exit; }
                 echo "### ifup ${2}: ignored ${2}_proto=\"$1\" (not supported)"
-        ;;
+                ;;
         esac
 }
@@ -139 +135 @@
 
 get_next_uid() {
-        uid=$(cat $IPKG_INSTROOT/etc/passwd | grep -v ^nobody \
-                | grep -v ^admin | \
-                tail -n 1 | awk -F : '{ print $3 }')
-        let uid=$uid+1
-        echo $uid
+        uid=$(grep -v -e ^nobody: -e ^admin: $IPKG_INSTROOT/etc/passwd | \
+            tail -n 1 | awk -F : '{ print $3 }')
+        echo $((uid+1))
 }
 
 get_next_gid() {
-        gid=$(cat $IPKG_INSTROOT/etc/group | grep -v ^nogroup \
-                | grep -v ^admin | \
-                tail -n 1 | awk -F : '{ print $3 }')
-        let gid=$gid+1
-        echo $gid
+        gid=$(grep -v -e ^nogroup: -e ^admin: $IPKG_INSTROOT/etc/group | \
+            tail -n 1 | awk -F : '{ print $3 }')
+        echo $((gid+1))
 }