1
0
mirror of https://github.com/TheLocehiliosan/yadm synced 2026-03-02 03:49:29 +00:00

Minor cleanups of alt handling

Also correct alt conditions precedence list in manual.
This commit is contained in:
Erik Flodin
2025-03-02 22:18:09 +01:00
parent 9ff5e09650
commit bee1558a4e
2 changed files with 18 additions and 16 deletions

11
yadm
View File

@@ -191,7 +191,11 @@ function score_file() {
local -i delta=$((negate ? 1 : -1))
case "$label" in
default)
delta=0
if ((negate)); then
INVALID_ALT+=("$source")
else
delta=0
fi
;;
a | arch)
[[ "$value" = "$local_arch" ]] && delta=1 || delta=-1
@@ -219,7 +223,7 @@ function score_file() {
continue
;;
t | template | yadm)
if [ -d "$source" ]; then
if [ -d "$source" ] || ((negate)); then
INVALID_ALT+=("$source")
else
template_processor=$(choose_template_processor "$value")
@@ -243,8 +247,7 @@ function score_file() {
score=0
return
fi
((negate)) || delta=$((delta + 1000))
score=$((score + delta))
score=$((score + delta + (negate ? 0 : 1000)))
done
record_score "$score" "$target" "$source" "$template_processor"