psi-jack
/
yadm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 80ca4a993a into 0f8538d3e3

This commit is contained in:
Erik Flodin 2022-09-26 20:48:01 +09:00 committed by GitHub
parent 0f8538d3e3 80ca4a993a
commit 0761702e27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yadm
View File

@ -36,6 +36,7 @@ YADM_ENCRYPT="encrypt"
YADM_BOOTSTRAP="bootstrap"
YADM_HOOKS="hooks"
YADM_ALT="alt"
YADM_CHECK_CONDITION="check_condition"
# these are the default paths relative to YADM_DATA
YADM_REPO="repo.git"
@ -175,6 +176,7 @@ function score_file() {
fi
score=0
declare -gA external_cache
IFS=',' read -ra fields <<< "$conditions"
for field in "${fields[@]}"; do
label=${field%%.*}
@ -238,6 +240,22 @@ function score_file() {
score=0
return
fi
elif [[ "$label" =~ ^(x|external)$ ]]; then
if [[ -z "${external_cache[x$value]:-}" ]]; then
if [[ -x "$YADM_CHECK_CONDITION" ]]; then
"$YADM_CHECK_CONDITION" "$value"
external_cache[x$value]=$?
else
debug "No program found to check condition for $src"
[ -n "$loud" ] && echo "No program found to check condition for $src"
fi
fi
if [[ ${external_cache[x$value]:-1} -eq 0 ]]; then
score=$((score + 32))
else
score=0
return
fi
# templates
elif [[ "$label" =~ ^(t|template|yadm)$ ]]; then
score=0
@ -1694,6 +1712,7 @@ function configure_paths() {
YADM_BOOTSTRAP="$YADM_DIR/$YADM_BOOTSTRAP"
YADM_HOOKS="$YADM_DIR/$YADM_HOOKS"
YADM_ALT="$YADM_DIR/$YADM_ALT"
YADM_CHECK_CONDITION="$YADM_DIR/$YADM_CHECK_CONDITION"
# change paths to be relative to YADM_DATA
YADM_REPO="$YADM_DATA/$YADM_REPO"