Преглед на файлове

gluon-autoupdater: fix version comparison

Matthias Schiffer преди 10 години
родител
ревизия
13d632acb8
променени са 2 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 1 1
      package/gluon-autoupdater/Makefile
  2. 3 2
      package/gluon-autoupdater/files/usr/sbin/autoupdater

+ 1 - 1
package/gluon-autoupdater/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gluon-autoupdater
   SECTION:=gluon
   CATEGORY:=Gluon
-  DEPENDS:=+gluon-core +gluon-cron +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum
+  DEPENDS:=+gluon-core +gluon-cron +opkg +ecdsautils +!BUSYBOX_CONFIG_SHA512SUM:coreutils-sha512sum
   TITLE:=Automatically update firmware
 endef
 

+ 3 - 2
package/gluon-autoupdater/files/usr/sbin/autoupdater

@@ -28,9 +28,10 @@ GOOD_SIGNATURES=$(uci get autoupdater.${BRANCH}.good_signatures)
 
 VERSION_FILE=/lib/gluon/release
 
+# returns 0 when $1 is a higher version number than $2
 newer_than() {
-  local old="$(printf '%s\n%s\n' "$1" "$2" | sort -n | head -n 1)"
-  test "$1" != "$old"
+	# negate the return value as opkg returns 1 when the proposition is true
+	! opkg compare-versions "$1" '>>' "$2"
 }
 
 fetch_manifest() {