1
0
mirror of https://github.com/TheLocehiliosan/yadm synced 2025-06-13 13:03:58 +00:00

Merge branch 'rasa/fix-brace-expansion'

This commit is contained in:
Ross Smith II 2018-03-10 11:09:39 -08:00
commit f5af9cd947

28
yadm
View File

@ -1072,17 +1072,9 @@ function parse_encrypt() {
local IFS=$'\n'
for pattern in $line; do
if [[ "$pattern" =~ $exclude_pattern ]]; then
for ex_file in ${BASH_REMATCH[1]}; do
if [ -e "$ex_file" ]; then
ENCRYPT_EXCLUDE_FILES+=("$ex_file")
fi
done
eval "parse_encrypt_exclude ${BASH_REMATCH[1]}"
else
for in_file in $pattern; do
if [ -e "$in_file" ]; then
ENCRYPT_INCLUDE_FILES+=("$in_file")
fi
done
eval "parse_encrypt_include $pattern"
fi
done
fi
@ -1107,6 +1099,22 @@ function parse_encrypt() {
}
function parse_encrypt_exclude() {
for ex_file in "$@"; do
if [ -e "$ex_file" ]; then
ENCRYPT_EXCLUDE_FILES+=("$ex_file")
fi
done
}
function parse_encrypt_include() {
for in_file in "$@"; do
if [ -e "$in_file" ]; then
ENCRYPT_INCLUDE_FILES+=("$in_file")
fi
done
}
function parse_ignore() {
IGNORE_LINES=()