diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 1305b90..aa12ce7 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -98,7 +98,10 @@ for pkg in "${PKGS[@]}"; do continue fi while IFS= read -r -d '' f; do - deploy_file "$f" "${f#"$pkg"/}" + rel="${f#"$pkg"/}" + # override packages nest base-package dirs internally: strip that segment for targets + if [ "${pkgname#zz-}" != "$pkgname" ]; then case "$rel" in */*) [ -d "$PKGS_DIR/${rel%%/*}" ] && rel="${rel#*/}";; esac; fi + deploy_file "$f" "$rel" done < <(find "$pkg" -type f ! -name 'dump.txt' -print0) done