From patchwork Mon Dec 3 19:54:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [1/2] configurehood: Copy local hoodfile to common location From: Fabian Blaese X-Patchwork-Id: 965 Message-Id: <20181203195455.7261-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Mon, 3 Dec 2018 20:54:54 +0100 Instead of overwriting local variable to local hoodfile location, copy it to the commonly used location. This makes the local hoodfile behave exactly like central hoodfiles, which prevents some border cases. The previous behaviour mainly caused issues when using getJsonPath() and getUpgradePath() from fff-hoodutils. Signed-off-by: Fabian Bläse Reviewed-by: Adrian Schmutzler Reviewed-by: Robert Langhammer --- src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index de60c21..4ae1364 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -77,7 +77,7 @@ if [ -s "$hoodfilewww" ] && isGatewayAvailable ; then fi if [ -s "$hoodfilelocal" ]; then - hoodfiletmp="$hoodfilelocal" + cp "$hoodfilelocal" "$hoodfiletmp" echo "Use local hood file" else # if we have Internet, we download the Hoodfile from the keyxchangev2