fix some test failures
This commit is contained in:
@@ -10,7 +10,7 @@ basic:
|
||||
|
||||
term: basic
|
||||
bash term/scripts/setup.sh
|
||||
stow term
|
||||
stow --ignore='.stow-ignore' --ignore='scripts' --ignore='\.config/tmux/plugins' term
|
||||
|
||||
utils: basic
|
||||
bash utils/setup.sh
|
||||
@@ -18,7 +18,7 @@ utils: basic
|
||||
|
||||
hypr: basic
|
||||
bash hypr/scripts/setup.sh
|
||||
stow hypr
|
||||
stow --ignore='.stow-ignore' --ignore='scripts' hypr
|
||||
|
||||
kreation: basic
|
||||
bash _install_skripte/install_kreation_pcks.sh
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
scripts
|
||||
.stow-ignore
|
||||
.config/tmux/plugins
|
||||
|
||||
@@ -79,13 +79,14 @@ done
|
||||
while IFS= read -r pkg; do
|
||||
[[ -z "$pkg" ]] && continue
|
||||
if stow --simulate --ignore='.stow-ignore' --ignore='scripts' \
|
||||
--ignore='\.config/tmux/plugins' \
|
||||
--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)"
|
||||
sed 's/^/ /' "$ERR_LOG" 2>/dev/null
|
||||
fi
|
||||
done < <(grep -P '^\t' Makefile | grep -oE 'stow [A-Za-z0-9_-]+' | awk '{print $2}' | sort -u)
|
||||
done < <(grep -P '^\t' Makefile | grep -E '\bstow\b' | awk '{print $NF}' | sort -u)
|
||||
|
||||
# 1c. run the repo's own lint + probe scripts (they're mounted here).
|
||||
if [[ -x test/lint.sh ]] || [[ -f test/lint.sh ]]; then
|
||||
@@ -285,6 +286,7 @@ NOOP
|
||||
for pkg in term hypr kreation local_ai; do
|
||||
if [[ -d "$REPO/$pkg" ]]; then
|
||||
if stow --ignore='.stow-ignore' --ignore='scripts' \
|
||||
--ignore='\.config/tmux/plugins' \
|
||||
--dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then
|
||||
say_ok "stow $pkg into \$HOME"
|
||||
else
|
||||
|
||||
+1
-1
@@ -155,7 +155,7 @@ while IFS= read -r pkg; do
|
||||
else
|
||||
say_fail "Makefile stows non-existent package: $pkg"
|
||||
fi
|
||||
done < <(grep -P '^\t' Makefile | grep -oE 'stow [A-Za-z0-9_-]+' | awk '{print $2}' | sort -u)
|
||||
done < <(grep -P '^\t' Makefile | grep -E '\bstow\b' | awk '{print $NF}' | sort -u)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Summary
|
||||
|
||||
+2
-2
@@ -55,7 +55,7 @@ trap cleanup EXIT
|
||||
|
||||
for pkg in "${PACKAGES[@]}"; do
|
||||
echo "--- stow --simulate: $pkg ---"
|
||||
if stow --simulate --verbose=1 --dir="$REPO_ROOT" --target="$REPO_ROOT" "$pkg" >/dev/null 2>"$ERR_LOG"; then
|
||||
if stow --simulate --verbose=1 --ignore='.stow-ignore' --ignore='scripts' --ignore='\.config/tmux/plugins' --dir="$REPO_ROOT" --target="$REPO_ROOT" "$pkg" >/dev/null 2>"$ERR_LOG"; then
|
||||
echo "ok: stow --simulate '$pkg' resolved without conflicts"
|
||||
else
|
||||
echo "FAIL: stow --simulate '$pkg'"
|
||||
@@ -66,7 +66,7 @@ done
|
||||
|
||||
# Cross-check: does the Makefile stow anything that is NOT in our package set?
|
||||
echo "== Checking Makefile stow targets against stow-able packages =="
|
||||
make_pkgs="$(grep -P '^\t' Makefile | grep -oE 'stow [A-Za-z0-9_-]+' | awk '{print $2}' | sort -u)"
|
||||
make_pkgs="$(grep -P '^\t' Makefile | grep -E '\bstow\b' | awk '{print $NF}' | sort -u)"
|
||||
for mp in $make_pkgs; do
|
||||
if is_stowable "$mp"; then
|
||||
echo "ok: Makefile 'stow $mp' matches a stow-able package"
|
||||
|
||||
Reference in New Issue
Block a user