From b75dbf8c700c14f585508480948a84822f122dac Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Mon, 13 Dec 2021 12:57:33 +0100 Subject: [PATCH] Fix ./manifests/scripts/bundle.sh path resolution The script now uses the path of the script file itself to determine the manifests directory paths. This fixes an issue when building the AUR packages where the check() phase would fail because the git repository of the package would be used and this would generate invalid paths. Signed-off-by: Aurel Canciu --- manifests/scripts/bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/scripts/bundle.sh b/manifests/scripts/bundle.sh index 31babc7c..c8f242c8 100755 --- a/manifests/scripts/bundle.sh +++ b/manifests/scripts/bundle.sh @@ -16,8 +16,8 @@ set -e -IN_PATH=${1:-"$(git rev-parse --show-toplevel)/manifests"} -OUT_PATH=${2:-"$(git rev-parse --show-toplevel)/cmd/flux/manifests"} +IN_PATH=${1:-"$(realpath $(dirname "${BASH_SOURCE[0]}")/../..)/manifests"} +OUT_PATH=${2:-"$(realpath $(dirname "${BASH_SOURCE[0]}")/../..)/cmd/flux/manifests"} TAR=${3} info() {