Merge pull request #307 from rasa/rs/simplify_parse_encrypt

yadm

@@ -1824,6 +1824,11 @@ function parse_encrypt() {
 
   ENCRYPT_INCLUDE_FILES=()
   ENCRYPT_EXCLUDE_FILES=()
+  FINAL_INCLUDE=()
+
+  if [ ! -f "$YADM_ENCRYPT" ] ; then
+    return
+  fi
 
   cd_work "Parsing encrypt" || return
 
@@ -1836,7 +1841,6 @@ function parse_encrypt() {
   shopt -s globstar &> /dev/null
 
   exclude_pattern="^!(.+)"
-  if [ -f "$YADM_ENCRYPT" ] ; then
   # parse both included/excluded
   while IFS='' read -r line || [ -n "$line" ]; do
     if [[ ! $line =~ ^# && ! $line =~ ^[[:blank:]]*$ ]] ; then
@@ -1861,7 +1865,6 @@ function parse_encrypt() {
 
   # remove excludes from the includes
   #(SC2068 is disabled because in this case, we desire globbing)
-    FINAL_INCLUDE=()
   #shellcheck disable=SC2068
   for included in "${ENCRYPT_INCLUDE_FILES[@]}"; do
     skip=
@@ -1876,7 +1879,6 @@ function parse_encrypt() {
   #shellcheck disable=SC2207
   IFS=$'\n' ENCRYPT_INCLUDE_FILES=($(LC_ALL=C sort <<<"${FINAL_INCLUDE[*]}"))
   unset IFS
-  fi
 
   if [ "$unset_globstar" = "1" ]; then
     shopt -u globstar &> /dev/null