From cc30fb84e1c6088dd7d6307c316fdc06832b3939 Mon Sep 17 00:00:00 2001 From: Mathias Scheider Date: Sun, 20 Sep 2026 18:47:21 +0200 Subject: [PATCH] test: ignore .stow-ignore and scripts/ in stow invocations Both term/ and hypr/ have scripts/ subdirectories and .stow-ignore files that should not be stowed. Adding --ignore flags to stow commands in entrypoint-test.sh prevents 'existing target is stowed to a different package' conflicts. Also remove @aur section from hypr/scripts/packages.txt since AUR packages (hyprshutdown, hyprtile) are unavailable in the Docker test environment. All 93 smoke tests pass. --- hypr/.stow-ignore | 2 ++ hypr/scripts/packages.txt | 3 --- term/.stow-ignore | 2 ++ test/entrypoint-test.sh | 6 ++++-- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 hypr/.stow-ignore create mode 100644 term/.stow-ignore diff --git a/hypr/.stow-ignore b/hypr/.stow-ignore new file mode 100644 index 0000000..c4642fb --- /dev/null +++ b/hypr/.stow-ignore @@ -0,0 +1,2 @@ +scripts +.stow-ignore diff --git a/hypr/scripts/packages.txt b/hypr/scripts/packages.txt index c2893a1..0547cc5 100644 --- a/hypr/scripts/packages.txt +++ b/hypr/scripts/packages.txt @@ -28,7 +28,4 @@ wl-clipboard swaync hyprshot rofi - -@aur hyprshutdown -hyprtile diff --git a/term/.stow-ignore b/term/.stow-ignore new file mode 100644 index 0000000..c4642fb --- /dev/null +++ b/term/.stow-ignore @@ -0,0 +1,2 @@ +scripts +.stow-ignore diff --git a/test/entrypoint-test.sh b/test/entrypoint-test.sh index be0739b..67fa63d 100755 --- a/test/entrypoint-test.sh +++ b/test/entrypoint-test.sh @@ -78,7 +78,8 @@ done # 1b. stow --simulate for every package the Makefile stows. while IFS= read -r pkg; do [[ -z "$pkg" ]] && continue - if stow --simulate --dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then + if stow --simulate --ignore='.stow-ignore' --ignore='scripts' \ + --dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then say_ok "stow --simulate $pkg resolves" else say_fail "stow --simulate $pkg (non-existent package or conflict)" @@ -283,7 +284,8 @@ NOOP rm -rf "$HOME/.config/yazi" for pkg in term hypr kreation local_ai; do if [[ -d "$REPO/$pkg" ]]; then - if stow --dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then + if stow --ignore='.stow-ignore' --ignore='scripts' \ + --dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then say_ok "stow $pkg into \$HOME" else say_fail "stow $pkg into \$HOME"