From 21c30cc8e5105ffa07de47e761fe32dfc397eb98 Mon Sep 17 00:00:00 2001 From: ngn Date: Mon, 12 Aug 2024 03:18:48 +0300 Subject: [PATCH] fix: building the INSTALL script --- matter-base/main.sh | 5 +++++ mp-build/scripts/mp-build.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/matter-base/main.sh b/matter-base/main.sh index 28760b6..27fdf93 100755 --- a/matter-base/main.sh +++ b/matter-base/main.sh @@ -185,6 +185,11 @@ matter-chroot "${target}" make-ca > /dev/null check_ret "Failed to run make-ca, install certs manually" rm -f "${target}/certdata.txt" +info "Running install scripts" +matter-chroot "${target}" bash -c "bash /var/lib/matt/data/scripts/*" > /dev/null +check_ret "Failed to run install scripts" +rm -f "${target}/var/lib/matt/data/scripts" + info "Setup complete, now creating the archive..." pushd "${target}" > /dev/null tar czf ../${name}.tar.gz * diff --git a/mp-build/scripts/mp-build.sh b/mp-build/scripts/mp-build.sh index 9e757d7..517ced5 100755 --- a/mp-build/scripts/mp-build.sh +++ b/mp-build/scripts/mp-build.sh @@ -415,7 +415,7 @@ success "(3/6) Created the changes file (CHANGES)" # create the install script if type INSTALL &>/dev/null; then - echo "$(type INSTALL | tail -n+2)" > "${distpath}/INSTALL" + echo "$(type INSTALL | head -n-1 | tail -n-2 | sed 's/ //')" > "${distpath}/INSTALL" check_ret "(4/6) Failed to create the install script (INSTALL)" fi success "(4/6) Created the install script (INSTALL)"