set boot_wait to on in the earliest possible moment. this makes webupgrade safer...

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

diff --git a/target/default/target_skeleton/bin/ipkg b/target/default/target_skeleton/bin/ipkg
index c9947c8..dd44dd6 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     
 
 ipkg_is_upgrade () {
   local A B a b     

-  A=$(echo $1 | sed -r "s/([0-9]+)[^A-Za-z]?/ \1 /g").
-  B=$(echo $2 | sed -r "s/([0-9]+)[^A-Za-z]?/ \1 /g").
+  A=$(echo $1 | sed -r "s/([0-9]+)[^[:alnum:]]*/ \1 /g").
+  B=$(echo $2 | sed -r "s/([0-9]+)[^[:alnum:]]*/ \1 /g").

   while [ \! -z "$A" ] && [ \! -z "$B" ]; do {        
     set $A; a=$1; shift; A=$*
     set $B; b=$1; shift; B=$*
   while [ \! -z "$A" ] && [ \! -z "$B" ]; do {        
     set $A; a=$1; shift; A=$*
     set $B; b=$1; shift; B=$*


@@ -874,6 +874,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"
        (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -))
        rm -rf $IPKG_TMP/$pkg/data
        rmdir $IPKG_TMP/$pkg
        (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -))
        rm -rf $IPKG_TMP/$pkg/data
        rmdir $IPKG_TMP/$pkg

+       rm -f $info_dir/$pkg.list

        $pkg_extract_stdout $filename ./data.tar.gz | tar tzf - | sed -e 's/^\.//' > $info_dir/$pkg.list
 
        if [ -x "$info_dir/$pkg.postinst" ]; then
        $pkg_extract_stdout $filename ./data.tar.gz | tar tzf - | sed -e 's/^\.//' > $info_dir/$pkg.list
 
        if [ -x "$info_dir/$pkg.postinst" ]; then