Fix nbd's nasty /var hack.

[openwrt-10.03/.git] / target / default / target_skeleton / bin / ipkg

diff --git a/target/default/target_skeleton/bin/ipkg b/target/default/target_skeleton/bin/ipkg
index bf275d842d168dcb8415c1214835efb8f1543d83..6ceb9d457460225d4efb8622a79038d9f8111129 100755 (executable)
--- a/target/default/target_skeleton/bin/ipkg
+++ b/target/default/target_skeleton/bin/ipkg
@@ -21,8 +21,8 @@ set -o noglob
 
 ipkg_is_upgrade () {
   local A B a b
-  A=$(echo $1 | sed "s/[0-9]*/ & /g")
-  B=$(echo $2 | sed "s/[0-9]*/ & /g")
+  A=$(echo $1 | sed "s/[0-9]*/ & /g" | sed "s/[^ A-Za-z0-9]//g")
+  B=$(echo $2 | sed "s/[0-9]*/ & /g" | sed "s/[^ A-Za-z0-9]//g")
   while [ \! -z "$A" ] && [ \! -z "$B" ]; do {
     set $A; a=$1; shift; A=$*
     set $B; b=$1; shift; B=$*
@@ -882,7 +882,8 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
        if [ -n "$new_conffiles" ]; then
                new_conffiles='Conffiles: '`echo $new_conffiles | ipkg_protect_slashes`
        fi
-       local sed_safe_root="`echo $dest | sed -e "s/^${IPKG_OFFLINE_ROOT}//" | ipkg_protect_slashes`"
+       local sed_safe_offline_root="`echo ${IPKG_OFFLINE_ROOT} | ipkg_protect_slashes`"
+       local sed_safe_root="`echo $dest | sed -e "s/^${sed_safe_offline_root}//" | ipkg_protect_slashes`"
        sed -e "s/\(Package:.*\)/\1\\
 Status: install ok installed\\
 Root: ${sed_safe_root}\\