aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2005-03-20 05:46:41 +0000
committerMike Baker <mbm@openwrt.org>2005-03-20 05:46:41 +0000
commit9a792fff85874206fd5408f9e2bf437b9e942196 (patch)
tree61db0abd401dac20f70dc69fecb6037316abf7ea
parent00772f36e0025329589e01e007d3bab32acc90d3 (diff)
downloadmaster-187ad058-9a792fff85874206fd5408f9e2bf437b9e942196.tar.gz
master-187ad058-9a792fff85874206fd5408f9e2bf437b9e942196.tar.bz2
master-187ad058-9a792fff85874206fd5408f9e2bf437b9e942196.zip
fix version checks
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@403 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/default/target_skeleton/bin/ipkg17
1 files changed, 9 insertions, 8 deletions
diff --git a/target/default/target_skeleton/bin/ipkg b/target/default/target_skeleton/bin/ipkg
index 6ceb9d4574..c9947c8fa0 100755
--- a/target/default/target_skeleton/bin/ipkg
+++ b/target/default/target_skeleton/bin/ipkg
@@ -20,16 +20,17 @@ set -e
set -o noglob
ipkg_is_upgrade () {
- local A B a b
- 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 {
+ 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").
+ while [ \! -z "$A" ] && [ \! -z "$B" ]; do {
set $A; a=$1; shift; A=$*
set $B; b=$1; shift; B=$*
- { [ "$a" -gt "$b" ] 2>&- || [ "$a" ">" "$b" ]; } && { return 0; }
- }; done
- return 1;
-}
+ [ "$a" -lt "$b" ] 2>&- && return 1
+ { [ "$a" -gt "$b" ] 2>&- || [ "$a" ">" "$b" ]; } && return
+ }; done
+ return 1
+}
ipkg_srcs() {
local srcre="$1"