[PATCH v2] fff-hoods: fix sed to substitute timestamp

Adrian Schmutzler freifunk at adrianschmutzler.de
Do Nov 2 13:01:17 CET 2017


From: Robert Langhammer <rlanghammer at web.de>

Rebased (v2). Apply after fff-hoods: Use w5sta for download!

Signed-off-by: Robert Langhammer <rlanghammer at web.de>
Reviewed-by: Tim Niemeyer <tim at tn-x.org>
Reviewed-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian at blaese.de>
Tested-by: Fabian Bläse <fabian at blaese.de>
---
 src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
index deba22b..8437c33 100755
--- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
+++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
@@ -140,8 +140,8 @@ if [ -s "$hoodfile" ]; then
 		json_get_var mesh_type5 mesh_type5
 	fi
 
-	catnew="$(cat "$hoodfile" | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
-	catold="$(cat "$hoodfilecopy" 2>/dev/null | sed 's/"timestamp":[0-9]*/"timestamp":0/')"
+	catnew="$(cat "$hoodfile" | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')"
+	catold="$(cat "$hoodfilecopy" 2>/dev/null | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')"
 	sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ")
 	sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ")
 
-- 
2.7.4



Mehr Informationen über die Mailingliste franken-dev