From patchwork Wed Nov 20 21:27:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Alternative, 1/2] fff-hoodutils: Adjust upgrade path function for changed folder structure From: Fabian Blaese X-Patchwork-Id: 1223 Message-Id: <20191120212745.11802-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Wed, 20 Nov 2019 22:27:44 +0100 As we now have multiple variants, the binaries on the update server should be seperated into different directories. To allow the firmware to decide which variant it wants to download, the "$VARIANT/current" part is removed from the hoodfiles. Instead it is added inside the upgrade path function in fff-hoodutils. Signed-off-by: Fabian Bläse Reviewed-by: Christian Dresel --- .../fff/fff-hoodutils/files/lib/functions/fff/keyxchange | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange b/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange index a18926e..faaa85f 100644 --- a/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange +++ b/src/packages/fff/fff-hoodutils/files/lib/functions/fff/keyxchange @@ -2,6 +2,7 @@ # License GPLv3 . /usr/share/libubox/jshn.sh +. /etc/firmware_release hoodfiletmp="/tmp/hoodfile" hoodfileref="/tmp/hoodfileref" @@ -21,14 +22,19 @@ getJsonPath() { getUpgradePath() { jsonfile="$(getJsonPath)" + local upgrade_path if [ -n "$jsonfile" ] ; then json_load "$(cat "$jsonfile")" json_select hood json_get_var upath upgrade_path - echo "$upath" + upgrade_path="$upath" else return 1 fi + + # add full firmware path for current firmwares variant + echo "${upgrade_path}/${VARIANT}/current" + return 0 }