From d45344dbe2d41ce451143663b3d0e4b7212b345c Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 8 Mar 2018 19:22:28 -0800 Subject: [PATCH] Fix brace expansion (fixes #106) --- yadm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/yadm b/yadm index e55a287..0aa9acc 100755 --- a/yadm +++ b/yadm @@ -927,17 +927,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 @@ -960,6 +952,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 +} + #; ****** Auto Functions ****** function auto_alt() {