From 83cbfcb5485a594794a676bdb31e8cda35abf0e9 Mon Sep 17 00:00:00 2001 From: BenediktMKuehne Date: Fri, 16 Dec 2022 14:57:16 +0100 Subject: [PATCH 1/2] update sub-shell pwd fix --- installer/IP12_avm_freetz_ng_extract.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/installer/IP12_avm_freetz_ng_extract.sh b/installer/IP12_avm_freetz_ng_extract.sh index 4e8cf2f7a..9cfe8a065 100755 --- a/installer/IP12_avm_freetz_ng_extract.sh +++ b/installer/IP12_avm_freetz_ng_extract.sh @@ -83,13 +83,10 @@ IP12_avm_freetz_ng_extract() { mkdir external/freetz-ng su - freetzuser -c "git clone https://github.com/Freetz-NG/freetz-ng.git /tmp/freetz-ng" - - cd /tmp/freetz-ng || ( echo "Could not install EMBA component Freetz-NG" && exit 1 ) - - su - freetzuser -c "make allnoconfig" + su - freetzuser -c "cd /tmp/freetz-ng/ && make allnoconfig" # we currently running into an error that does not hinder us in using Freetz-NG # sudo -u freetzuser make || true - su - freetzuser -c "make tools" + su - freetzuser -c "cd /tmp/freetz-ng/ && make tools" cd "$HOME_PATH" || ( echo "Could not install EMBA component Freetz-NG" && exit 1 ) mv -r /tmp/freetz-ng/* external/freetz-ng/ chown -R root:root external/freetz-ng From d77276063966598a5362d0f5841077893088de31 Mon Sep 17 00:00:00 2001 From: Benedikt Kuehne <62940240+BenediktMKuehne@users.noreply.github.com> Date: Fri, 16 Dec 2022 15:45:42 +0100 Subject: [PATCH 2/2] Update IP12_avm_freetz_ng_extract.sh --- installer/IP12_avm_freetz_ng_extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/IP12_avm_freetz_ng_extract.sh b/installer/IP12_avm_freetz_ng_extract.sh index 9cfe8a065..0e598d482 100755 --- a/installer/IP12_avm_freetz_ng_extract.sh +++ b/installer/IP12_avm_freetz_ng_extract.sh @@ -88,7 +88,7 @@ IP12_avm_freetz_ng_extract() { # sudo -u freetzuser make || true su - freetzuser -c "cd /tmp/freetz-ng/ && make tools" cd "$HOME_PATH" || ( echo "Could not install EMBA component Freetz-NG" && exit 1 ) - mv -r /tmp/freetz-ng/* external/freetz-ng/ + mv /tmp/freetz-ng/* external/freetz-ng/ chown -R root:root external/freetz-ng if [[ "$IN_DOCKER" -eq 1 ]]; then # do some cleanup of the docker image