From ab682e1d46d3d1ac3184952c3d26f314f0d74b04 Mon Sep 17 00:00:00 2001 From: jwerle Date: Thu, 31 Mar 2022 08:02:21 -0400 Subject: [PATCH] fix(lib/env/env.sh): look up sources if bpkg path can be resolved --- lib/env/env.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/env/env.sh b/lib/env/env.sh index e67a12f..b4d701c 100755 --- a/lib/env/env.sh +++ b/lib/env/env.sh @@ -37,7 +37,7 @@ export BPKG_PACKAGE_USER export BPKG_PACKAGE_NAME="$(bpkg_package name 2>/dev/null)" export BPKG_PACKAGE_REPO="$(bpkg_package repo 2>/dev/null)" export BPKG_PACKAGE_PATH="$(bpkg_package_path)" -export BPKG_PACKAGE_ROOT="$(dirname "$BPKG_PACKAGE_PATH")" +export BPKG_PACKAGE_ROOT="$(realpath "$(dirname "$BPKG_PACKAGE_PATH")")" export BPKG_PACKAGE_DEPS="$BPKG_PACKAGE_ROOT/deps" export BPKG_PACKAGE_VERSION="$(bpkg_package version 2>/dev/null)" export BPKG_PACKAGE_DESCRIPTION="$(bpkg_package description 2>/dev/null)" @@ -49,11 +49,11 @@ export BPKG_REMOTE export BPKG_REMOTES export BPKG_REMOTE_RAW_PATH -if test -f bpkg.json || test -f package.json; then +if test -f "$BPKG_PACKAGE_PATH"; then declare -a BPKG_SCRIPT_SOURCES=() - BPKG_SCRIPT_SOURCES+=($(find . -name '*.sh')) - BPKG_SCRIPT_SOURCES+=($(find . -name '*.zsh')) - BPKG_SCRIPT_SOURCES+=($(find . -name '*.bash')) + BPKG_SCRIPT_SOURCES+=($(find "$BPKG_SCRIPT_ROOT" -name '*.sh' 2>/dev/null)) + BPKG_SCRIPT_SOURCES+=($(find "$BPKG_SCRIPT_ROOT" -name '*.zsh' 2>/dev/null)) + BPKG_SCRIPT_SOURCES+=($(find "$BPKG_SCRIPT_ROOT" -name '*.bash' 2>/dev/null)) export BPKG_SCRIPT_SOURCES fi