base-files: default_postinst() fix variable colision

[openwrt/staging/wigyori.git] / package / base-files / files / lib / functions.sh

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index d53be3edfe7a1dc02107771f12c106760ad4a283..dc3b80534b2a199a1c616fa5ba3ef686a6103847 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -171,55 +171,57 @@ default_prerm() {
 }
 
 default_postinst() {
-       local name rusers
-       name=$(echo $(basename $1) | cut -d. -f1)
-       [ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg ] && ( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.postinst-pkg )
-       rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.control)
+       local pkgname rusers
+       pkgname=$(echo $(basename $1) | cut -d. -f1)
+       rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.control)
        [ -n "$rusers" ] && {
                local user group uid gid
                for a in $(echo $rusers | sed "s/Require-User://g"); do
                        user=""
                        group=""
                        for b in $(echo $a | sed "s/:/ /g"); do
-                               local name id
+                               local ugname ugid
 
-                               name=$(echo $b | cut -d= -f1)
-                               id=$(echo $b | cut -d= -f2)
+                               ugname=$(echo $b | cut -d= -f1)
+                               ugid=$(echo $b | cut -d= -f2)
 
                                [ -z "$user" ] && {
-                                       user=$name
-                                       uid=$id
+                                       user=$ugname
+                                       uid=$ugid
                                        continue
                                }
 
-                               gid=$id
+                               gid=$ugid
                                [ -n "$gid" ] && {
-                                       group_exists $name || group_add $name $gid
+                                       group_exists $ugname || group_add $ugname $gid
                                }
 
                                [ -z "$gid" ] && {
-                                       group_add_next $name
+                                       group_add_next $ugname
                                        gid=$?
                                }
 
                                [ -z "$group" ] && {
                                        user_exists $user || user_add $user "$uid" $gid
-                                       group=$name
+                                       group=$ugname
                                        continue
                                }
 
-                               group_add_user $name $user
+                               group_add_user $ugname $user
                        done
                done
        }
-       [ "$PKG_UPGRADE" = "1" ] || for i in `cat ${IPKG_INSTROOT}/usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
+
+       [ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg ] && ( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg )
+       [ -n "${IPKG_INSTROOT}" ] || rm -f /tmp/luci-indexcache 2>/dev/null
+
+       [ "$PKG_UPGRADE" = "1" ] || for i in `cat ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.list | grep "^/etc/init.d/"`; do
                [ -n "${IPKG_INSTROOT}" ] && $(which bash) ${IPKG_INSTROOT}/etc/rc.common ${IPKG_INSTROOT}$i enable; \
                [ -n "${IPKG_INSTROOT}" ] || {
                        $i enable
                        $i start
                }
        done
-       [ -n "${IPKG_INSTROOT}" ] || rm -f /tmp/luci-indexcache 2>/dev/null
        return 0
 }