mathias2784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix some test failures

Browse Source
This commit is contained in:
mathias2784
2026-09-21 22:12:57 +02:00
parent 0ca73bf029
commit c54c7a2b9d
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -2
View File
@@ -10,7 +10,7 @@ basic:
term: basic term: basic
bash term/scripts/setup.sh bash term/scripts/setup.sh
stow term stow --ignore='.stow-ignore' --ignore='scripts' --ignore='\.config/tmux/plugins' term
utils: basic utils: basic
bash utils/setup.sh bash utils/setup.sh
@@ -18,7 +18,7 @@ utils: basic
hypr: basic hypr: basic
bash hypr/scripts/setup.sh bash hypr/scripts/setup.sh
stow hypr stow --ignore='.stow-ignore' --ignore='scripts' hypr
kreation: basic kreation: basic
bash _install_skripte/install_kreation_pcks.sh bash _install_skripte/install_kreation_pcks.sh
term/.stow-ignore
+1
View File
@@ -1,2 +1,3 @@
scripts scripts
.stow-ignore .stow-ignore
.config/tmux/plugins
test/entrypoint-test.sh
+3 -1
View File
@@ -79,13 +79,14 @@ done
while IFS= read -r pkg; do while IFS= read -r pkg; do
[[ -z "$pkg" ]] && continue [[ -z "$pkg" ]] && continue
if stow --simulate --ignore='.stow-ignore' --ignore='scripts' \ if stow --simulate --ignore='.stow-ignore' --ignore='scripts' \
--ignore='\.config/tmux/plugins' \
--dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then --dir="$REPO" --target="$REPO" "$pkg" 2>"$ERR_LOG"; then
say_ok "stow --simulate $pkg resolves" say_ok "stow --simulate $pkg resolves"
else else
say_fail "stow --simulate $pkg (non-existent package or conflict)" say_fail "stow --simulate $pkg (non-existent package or conflict)"
sed 's/^/ /' "$ERR_LOG" 2>/dev/null sed 's/^/ /' "$ERR_LOG" 2>/dev/null
fi 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). # 1c. run the repo's own lint + probe scripts (they're mounted here).
if [[ -x test/lint.sh ]] || [[ -f test/lint.sh ]]; then if [[ -x test/lint.sh ]] || [[ -f test/lint.sh ]]; then
@@ -285,6 +286,7 @@ NOOP
for pkg in term hypr kreation local_ai; do for pkg in term hypr kreation local_ai; do
if [[ -d "$REPO/$pkg" ]]; then if [[ -d "$REPO/$pkg" ]]; then
if stow --ignore='.stow-ignore' --ignore='scripts' \ if stow --ignore='.stow-ignore' --ignore='scripts' \
--ignore='\.config/tmux/plugins' \
--dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then --dir="$REPO" --target="$HOME" "$pkg" 2>"$ERR_LOG"; then
say_ok "stow $pkg into \$HOME" say_ok "stow $pkg into \$HOME"
else else
test/lint.sh
+1 -1
View File
@@ -155,7 +155,7 @@ while IFS= read -r pkg; do
else else
say_fail "Makefile stows non-existent package: $pkg" say_fail "Makefile stows non-existent package: $pkg"
fi 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 # Summary
test/probe_stow.sh
+2 -2
View File
@@ -55,7 +55,7 @@ trap cleanup EXIT
for pkg in "${PACKAGES[@]}"; do for pkg in "${PACKAGES[@]}"; do
echo "--- stow --simulate: $pkg ---" 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" echo "ok: stow --simulate '$pkg' resolved without conflicts"
else else
echo "FAIL: stow --simulate '$pkg'" echo "FAIL: stow --simulate '$pkg'"
@@ -66,7 +66,7 @@ done
# Cross-check: does the Makefile stow anything that is NOT in our package set? # Cross-check: does the Makefile stow anything that is NOT in our package set?
echo "== Checking Makefile stow targets against stow-able packages ==" 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 for mp in $make_pkgs; do
if is_stowable "$mp"; then if is_stowable "$mp"; then
echo "ok: Makefile 'stow $mp' matches a stow-able package" echo "ok: Makefile 'stow $mp' matches a stow-able package"