fix strict bash pipefail

tests-ng/actions-args-template.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions-args.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions-default.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions-empty-dir.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions-pre.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions-template.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/actions.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/backup.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/bad-diff-cmd.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-compare.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-import.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -194,7 +194,7 @@ cat "${cfg}"
 # list files
 cd "${ddpath}" | ${bin} detail -c "${cfg}" -p p1 -V
 
-cnt=$(cat "${cfg}" | grep chmod | wc -l)
+cnt=$(cat "${cfg}" | (grep chmod || :) | wc -l)
 [ "${cnt}" != "0" ] && echo "chmod inserted but not needed" && exit 1
 
 ## with config option chmod_on_import

tests-ng/chmod-install-dir.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-install.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-more.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-preserve-install.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/chmod-preserve-update.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -120,15 +120,19 @@ profiles:
 _EOF
 #cat ${cfg}
 
-echo "update"
+echo "update1"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/exists
+echo "update2"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/existslink
+echo "update3"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/direxists
+echo "update4"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/linkchildren
+echo "update5"
 cd "${ddpath}" | ${bin} update -f -c "${cfg}" -p p1 -V "${tmpd}"/nomode
 
-count=$(cat "${cfg}" | grep chmod | grep -v 'chmod: preserve\|force_chmod' | wc -l)
-echo "${count}"
+count=$(grep chmod "${cfg}" | (grep -v 'preserve\|force_chmod' || :) | wc -l)
+echo "chmod changed: ${count}"
 [ "${count}" != "0" ] && echo "chmod altered" && exit 1
 
 echo "OK"

tests-ng/chmod-update.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"
@@ -80,7 +80,7 @@ done
 cat "${cfg}"
 
 # test no chmod
-cnt=$(cat "${cfg}" | grep chmod | wc -l)
+cnt=$(cat "${cfg}" | ( grep chmod || : ) | wc -l)
 [ "${cnt}" != "0" ] && echo "chmod wrongly inserted" && exit 1
 
 ######################

tests-ng/clear-workdir.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-diff-types.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-global-negative-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-ignore-in-dotpath.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-ignore-missing.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-ignore-relative.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-include.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-negative-ignore-all-but.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-negative-ignore-relative.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare-negative-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 # exit on first error
-#set -euo errtrace pipefail
+#set -eu -o errtrace -o pipefail
 
 cur=$(cd "$(dirname "${0}")" && pwd)
 

tests-ng/compare-profile-check.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/compare.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/corner-case.sh

@@ -12,7 +12,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/deprecated-link.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/diff-cmd.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dir-import-update.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotdrop-variables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotfile-no-src.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotfile-sub-variables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotfile-variables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotfiles-all.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dotfiles-dyn-paths.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/double-config-import.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dry.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/duplicate-key.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dynactions.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dyndotfilepaths.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dynextvariables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dyninclude.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/dynvariables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/env.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/ext-actions.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/extvariables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/filter_file.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/force-actions.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/func_file.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/global-compare-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/global-update-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/globs.sh

@@ -10,7 +10,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/header.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/helpers

@@ -6,7 +6,7 @@
 #
 # for i in *.sh; do ./$i >/dev/null 2>&1; find /tmp/ -maxdepth 1 -type f -iname 'tmp*' >> /tmp/$i.log; find /tmp/ -maxdepth 1 -type d -iname 'tmp.*-dotdrop-tests' >> /tmp/$i.log; find /tmp/ -maxdepth 1 -type d  -iname 'dotdrop-*' >> /tmp/$i.log; wc -l /tmp/$i.log; [ "`wc -l /tmp/$i.log | awk '{print $1}'`" -gt "0" ] && break; done
 
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 
 #declare -a to_be_cleared
 to_be_cleared=()

tests-ng/ignore-empty.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-as.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-configs.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-configs2.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-duplicate.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-ignore-in-dotpath.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-include.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-link-children.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-negative-ignore-all-but.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-negative-ignore.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-non-existing.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-profile-dotfiles.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-subfile.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-to-no-profile.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-variables.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-with-empty.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import-with-trans.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/import.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/imported-configs-variables.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/imported-variables-from-config.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/include-actions.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/include-order.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/include-variables.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/include.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/inst-link-default.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-and-remove.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-empty.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-link-children.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-negative-ignore-all-but.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-negative-ignore-no-match.sh

@@ -8,7 +8,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-negative-ignore.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install-to-temp.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/install.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/jhelpers.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/key-prefix-sep.sh

@@ -6,7 +6,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/link-import-default.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/link-templates-dir-home.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/link-templates-dir.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"

tests-ng/link-templates.sh

@@ -7,7 +7,7 @@
 #
 
 ## start-cookie
-set -euo errtrace pipefail
+set -eu -o errtrace -o pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
 PPATH="{PYTHONPATH:-}"