fff-sysupgrade: Fix comparison for version in sysupgrade.sh

Submitted by Adrian Schmutzler on Sept. 14, 2018, 9:49 p.m.

Details

Message ID 20180914214956.24264-1-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler Sept. 14, 2018, 9:49 p.m.
The previous version seemed to work only for numeric data.

Fixes #113

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 6b6c10af..3e4da41e 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -42,7 +42,7 @@  VERSION=$(awk -F: '/VERSION:/ { print $2 }' release.nfo)
 rm -f release.nfo
 echo "Firmware found on server: $VERSION"
 
-if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
+if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then
   echo "The installed firmware version is already the current version."
   echo ""
 

Comments

Fabian Blaese Oct. 24, 2018, 8:04 p.m.
Hallo Adrian,

da unsere Versionsnummern definitiv nicht ausschließlich nummerisch sind, sollte das auf jeden Fall rein.

Reviewed-by: Fabian Bläse <fabian@blaese.de>

Fabian

On 14.09.18 23:49, Adrian Schmutzler wrote:
> The previous version seemed to work only for numeric data.
> 
> Fixes #113
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> index 6b6c10af..3e4da41e 100755
> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
> @@ -42,7 +42,7 @@ VERSION=$(awk -F: '/VERSION:/ { print $2 }' release.nfo)
>  rm -f release.nfo
>  echo "Firmware found on server: $VERSION"
>  
> -if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
> +if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then
>    echo "The installed firmware version is already the current version."
>    echo ""
>  
>
Adrian Schmutzler Oct. 25, 2018, 2:39 p.m.
Applied.

 

From: Fabian Bläse [mailto:fabian@blaese.de] 
Sent: Mittwoch, 24. Oktober 2018 22:05
To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH] fff-sysupgrade: Fix comparison for version in sysupgrade.sh

 

Hallo Adrian, 

da unsere Versionsnummern definitiv nicht ausschließlich nummerisch sind, sollte das auf jeden Fall rein. 

Reviewed-by: Fabian Bläse <fabian@blaese.de <mailto:fabian@blaese.de> > 

Fabian 

On 14.09.18 23:49, Adrian Schmutzler wrote: 
> The previous version seemed to work only for numeric data. 
> 
> Fixes #113 
> 
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > 
> --- 
>  src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 2 +- 
>  1 file changed, 1 insertion(+), 1 deletion(-) 
> 
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh

> index 6b6c10af..3e4da41e 100755 
> --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh 
> +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh 
> @@ -42,7 +42,7 @@ VERSION=$(awk -F: '/VERSION:/ { print $2 }' release.nfo) 
>  rm -f release.nfo 
>  echo "Firmware found on server: $VERSION" 
>  
> -if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then 
> +if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then 
>    echo "The installed firmware version is already the current version." 
>    echo "" 
>  
>