From 94d97bf7a765168d550d2dabfe15a6b986cabd25 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 9 Nov 2023 11:30:05 +0100 Subject: [PATCH] fix strict bash pipefail --- completion/generate.sh | 2 +- dotdrop/dotfile.py | 8 ++++---- scripts/check-doc.sh | 2 +- scripts/check-syntax.sh | 5 +++-- scripts/check-tests-ng.sh | 2 +- scripts/check-unittests.sh | 2 +- tests-ng/actions-args-template.sh | 2 +- tests-ng/actions-args.sh | 2 +- tests-ng/actions-default.sh | 2 +- tests-ng/actions-empty-dir.sh | 2 +- tests-ng/actions-pre.sh | 2 +- tests-ng/actions-template.sh | 2 +- tests-ng/actions.sh | 2 +- tests-ng/backup.sh | 2 +- tests-ng/bad-diff-cmd.sh | 2 +- tests-ng/chmod-compare.sh | 2 +- tests-ng/chmod-import.sh | 4 ++-- tests-ng/chmod-install-dir.sh | 2 +- tests-ng/chmod-install.sh | 2 +- tests-ng/chmod-more.sh | 2 +- tests-ng/chmod-preserve-install.sh | 2 +- tests-ng/chmod-preserve-update.sh | 12 ++++++++---- tests-ng/chmod-update.sh | 4 ++-- tests-ng/clear-workdir.sh | 2 +- tests-ng/compare-diff-types.sh | 2 +- tests-ng/compare-global-negative-ignore.sh | 2 +- tests-ng/compare-ignore-in-dotpath.sh | 2 +- tests-ng/compare-ignore-missing.sh | 2 +- tests-ng/compare-ignore-relative.sh | 2 +- tests-ng/compare-ignore.sh | 2 +- tests-ng/compare-include.sh | 2 +- tests-ng/compare-negative-ignore-all-but.sh | 2 +- tests-ng/compare-negative-ignore-relative.sh | 2 +- tests-ng/compare-negative-ignore.sh | 2 +- tests-ng/compare-profile-check.sh | 2 +- tests-ng/compare.sh | 2 +- tests-ng/corner-case.sh | 2 +- tests-ng/deprecated-link.sh | 2 +- tests-ng/diff-cmd.sh | 2 +- tests-ng/dir-import-update.sh | 2 +- tests-ng/dotdrop-variables.sh | 2 +- tests-ng/dotfile-no-src.sh | 2 +- tests-ng/dotfile-sub-variables.sh | 2 +- tests-ng/dotfile-variables.sh | 2 +- tests-ng/dotfiles-all.sh | 2 +- tests-ng/dotfiles-dyn-paths.sh | 2 +- tests-ng/double-config-import.sh | 2 +- tests-ng/dry.sh | 2 +- tests-ng/duplicate-key.sh | 2 +- tests-ng/dynactions.sh | 2 +- tests-ng/dyndotfilepaths.sh | 2 +- tests-ng/dynextvariables.sh | 2 +- tests-ng/dyninclude.sh | 2 +- tests-ng/dynvariables.sh | 2 +- tests-ng/env.sh | 2 +- tests-ng/ext-actions.sh | 2 +- tests-ng/extvariables.sh | 2 +- tests-ng/filter_file.sh | 2 +- tests-ng/force-actions.sh | 2 +- tests-ng/func_file.sh | 2 +- tests-ng/global-compare-ignore.sh | 2 +- tests-ng/global-update-ignore.sh | 2 +- tests-ng/globs.sh | 2 +- tests-ng/header.sh | 2 +- tests-ng/helpers | 2 +- tests-ng/ignore-empty.sh | 2 +- tests-ng/import-as.sh | 2 +- tests-ng/import-configs.sh | 2 +- tests-ng/import-configs2.sh | 2 +- tests-ng/import-duplicate.sh | 2 +- tests-ng/import-ignore-in-dotpath.sh | 2 +- tests-ng/import-ignore.sh | 2 +- tests-ng/import-include.sh | 2 +- tests-ng/import-link-children.sh | 2 +- tests-ng/import-negative-ignore-all-but.sh | 2 +- tests-ng/import-negative-ignore.sh | 2 +- tests-ng/import-non-existing.sh | 2 +- tests-ng/import-profile-dotfiles.sh | 2 +- tests-ng/import-subfile.sh | 2 +- tests-ng/import-to-no-profile.sh | 2 +- tests-ng/import-variables.sh | 2 +- tests-ng/import-with-empty.sh | 2 +- tests-ng/import-with-trans.sh | 2 +- tests-ng/import.sh | 2 +- tests-ng/imported-configs-variables.sh | 2 +- tests-ng/imported-variables-from-config.sh | 2 +- tests-ng/include-actions.sh | 2 +- tests-ng/include-order.sh | 2 +- tests-ng/include-variables.sh | 2 +- tests-ng/include.sh | 2 +- tests-ng/inst-link-default.sh | 2 +- tests-ng/install-and-remove.sh | 2 +- tests-ng/install-empty.sh | 2 +- tests-ng/install-ignore.sh | 2 +- tests-ng/install-link-children.sh | 2 +- tests-ng/install-negative-ignore-all-but.sh | 2 +- tests-ng/install-negative-ignore-no-match.sh | 2 +- tests-ng/install-negative-ignore.sh | 2 +- tests-ng/install-to-temp.sh | 2 +- tests-ng/install.sh | 2 +- tests-ng/jhelpers.sh | 2 +- tests-ng/key-prefix-sep.sh | 2 +- tests-ng/link-import-default.sh | 2 +- tests-ng/link-templates-dir-home.sh | 2 +- tests-ng/link-templates-dir.sh | 2 +- tests-ng/link-templates.sh | 2 +- tests-ng/link-value-tests.sh | 2 +- tests-ng/macro-with-globals.sh | 2 +- tests-ng/minversion.sh | 2 +- tests-ng/misc.sh | 2 +- tests-ng/notemplate.sh | 2 +- tests-ng/profile-actions.sh | 2 +- tests-ng/profile-dyninclude.sh | 2 +- tests-ng/profile-dynvariables.sh | 2 +- tests-ng/profile-import-dotfiles.sh | 2 +- tests-ng/profile-undefined-variables.sh | 2 +- tests-ng/re-import.sh | 2 +- tests-ng/recinclude.sh | 2 +- tests-ng/recvariables.sh | 2 +- tests-ng/remove.sh | 2 +- tests-ng/symlink-relative.sh | 2 +- tests-ng/symlink.sh | 2 +- tests-ng/template-dotpath.sh | 2 +- tests-ng/template-link-value.sh | 2 +- tests-ng/template-link.sh | 2 +- tests-ng/template-vars-dict.sh | 2 +- tests-ng/toml.sh | 2 +- tests-ng/transformations-template.sh | 2 +- tests-ng/transformations-with-args.sh | 2 +- tests-ng/transformations.sh | 2 +- tests-ng/uninstall.sh | 2 +- tests-ng/update-global-negative-ignore.sh | 2 +- tests-ng/update-ignore-in-dotpath.sh | 2 +- tests-ng/update-ignore-missing.sh | 2 +- tests-ng/update-ignore-relative.sh | 2 +- tests-ng/update-ignore.sh | 2 +- tests-ng/update-negative-ignore-all-but.sh | 2 +- tests-ng/update-negative-ignore-relative.sh | 2 +- tests-ng/update-negative-ignore.sh | 2 +- tests-ng/update-profile-check.sh | 2 +- tests-ng/update-rights.sh | 2 +- tests-ng/update-templates.sh | 2 +- tests-ng/update-with-key.sh | 2 +- tests-ng/update.sh | 2 +- tests-ng/uservariables.sh | 2 +- tests-ng/variables-enrich.sh | 2 +- tests-ng/variables-include.sh | 2 +- tests-ng/variables-nested.sh | 2 +- tests-ng/variables.sh | 2 +- tests-ng/workdir-compare.sh | 2 +- tests-ng/workdir.sh | 2 +- tests.sh | 3 +-- 152 files changed, 166 insertions(+), 162 deletions(-) diff --git a/completion/generate.sh b/completion/generate.sh index 1e875a0..784051e 100755 --- a/completion/generate.sh +++ b/completion/generate.sh @@ -5,7 +5,7 @@ # pip3 install --user infi.docopt_completion # -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail bin="docopt-completion" if ! hash ${bin}; then diff --git a/dotdrop/dotfile.py b/dotdrop/dotfile.py index 8058cd5..e586809 100644 --- a/dotdrop/dotfile.py +++ b/dotdrop/dotfile.py @@ -141,23 +141,23 @@ class Dotfile(DictParser): some = self.get_pre_actions() if some: for act in some: - out += f'\n{2*indent}- {act}' + out += f'\n{2 * indent}- {act}' out += f'\n{indent}post-action:' some = self.get_post_actions() if some: for act in some: - out += f'\n{2*indent}- {act}' + out += f'\n{2 * indent}- {act}' out += f'\n{indent}trans_install:' some = self.get_trans_install() if some: - out += f'\n{2*indent}- {some}' + out += f'\n{2 * indent}- {some}' out += f'\n{indent}trans_update:' some = self.get_trans_update() if some: - out += f'\n{2*indent}- {some}' + out += f'\n{2 * indent}- {some}' return out def __repr__(self): diff --git a/scripts/check-doc.sh b/scripts/check-doc.sh index fa002f9..ddd1a8e 100755 --- a/scripts/check-doc.sh +++ b/scripts/check-doc.sh @@ -3,7 +3,7 @@ # Copyright (c) 2022, deadc0de6 # stop on first error -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail ## test doc external links echo "------------------------" diff --git a/scripts/check-syntax.sh b/scripts/check-syntax.sh index d60ff99..019620c 100755 --- a/scripts/check-syntax.sh +++ b/scripts/check-syntax.sh @@ -3,7 +3,7 @@ # Copyright (c) 2022, deadc0de6 # stop on first error -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail # ensure binaries are here if ! which shellcheck >/dev/null 2>&1; then @@ -50,7 +50,8 @@ echo "---------------------------------" echo "checking for bash strict mode" find tests-ng -iname '*.sh' | while read -r script; do #grep 'set +e' "${script}" 2>&1 >/dev/null && echo "set +e found in ${script}" && exit 1 - grep 'set -euo errtrace pipefail' "${script}" >/dev/null 2>&1 || (echo "set -euo errtrace pipefail not set in ${script}" && exit 1 ) + grep 'set -eu -o errtrace -o pipefail' "${script}" >/dev/null 2>&1 || \ + (echo "\"set -eu -o errtrace -o pipefail\" not set in ${script}" && exit 1 ) done # PEP8 tests diff --git a/scripts/check-tests-ng.sh b/scripts/check-tests-ng.sh index 9dc74df..61d0bbf 100755 --- a/scripts/check-tests-ng.sh +++ b/scripts/check-tests-ng.sh @@ -3,7 +3,7 @@ # Copyright (c) 2023, deadc0de6 # stop on first error -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail tmpworkdir="/tmp/dotdrop-tests-workdir" export DOTDROP_WORKDIR="${tmpworkdir}" diff --git a/scripts/check-unittests.sh b/scripts/check-unittests.sh index fbb1810..fe0e63c 100755 --- a/scripts/check-unittests.sh +++ b/scripts/check-unittests.sh @@ -3,7 +3,7 @@ # Copyright (c) 2023, deadc0de6 # stop on first error -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail WORKERS=${DOTDROP_WORKERS:-} if [ -n "${WORKERS}" ]; then diff --git a/tests-ng/actions-args-template.sh b/tests-ng/actions-args-template.sh index 180b275..0565f52 100755 --- a/tests-ng/actions-args-template.sh +++ b/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:-}" diff --git a/tests-ng/actions-args.sh b/tests-ng/actions-args.sh index 7ea324c..2f268fa 100755 --- a/tests-ng/actions-args.sh +++ b/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:-}" diff --git a/tests-ng/actions-default.sh b/tests-ng/actions-default.sh index be3c81a..cefe041 100755 --- a/tests-ng/actions-default.sh +++ b/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:-}" diff --git a/tests-ng/actions-empty-dir.sh b/tests-ng/actions-empty-dir.sh index 90cede4..98d46bb 100755 --- a/tests-ng/actions-empty-dir.sh +++ b/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:-}" diff --git a/tests-ng/actions-pre.sh b/tests-ng/actions-pre.sh index 506ae69..ad8c0f6 100755 --- a/tests-ng/actions-pre.sh +++ b/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:-}" diff --git a/tests-ng/actions-template.sh b/tests-ng/actions-template.sh index 6974883..54ab1de 100755 --- a/tests-ng/actions-template.sh +++ b/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:-}" diff --git a/tests-ng/actions.sh b/tests-ng/actions.sh index 4b64d7e..f35bf65 100755 --- a/tests-ng/actions.sh +++ b/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:-}" diff --git a/tests-ng/backup.sh b/tests-ng/backup.sh index ae6a58a..b9b16e2 100755 --- a/tests-ng/backup.sh +++ b/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:-}" diff --git a/tests-ng/bad-diff-cmd.sh b/tests-ng/bad-diff-cmd.sh index 5b6974f..fbfbd17 100755 --- a/tests-ng/bad-diff-cmd.sh +++ b/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:-}" diff --git a/tests-ng/chmod-compare.sh b/tests-ng/chmod-compare.sh index e463abf..3a0d2db 100755 --- a/tests-ng/chmod-compare.sh +++ b/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:-}" diff --git a/tests-ng/chmod-import.sh b/tests-ng/chmod-import.sh index 6dd1560..09989ae 100755 --- a/tests-ng/chmod-import.sh +++ b/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 diff --git a/tests-ng/chmod-install-dir.sh b/tests-ng/chmod-install-dir.sh index 6576952..f1d4fb5 100755 --- a/tests-ng/chmod-install-dir.sh +++ b/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:-}" diff --git a/tests-ng/chmod-install.sh b/tests-ng/chmod-install.sh index 56f4962..faa312d 100755 --- a/tests-ng/chmod-install.sh +++ b/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:-}" diff --git a/tests-ng/chmod-more.sh b/tests-ng/chmod-more.sh index b4183cc..5a4c2b9 100755 --- a/tests-ng/chmod-more.sh +++ b/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:-}" diff --git a/tests-ng/chmod-preserve-install.sh b/tests-ng/chmod-preserve-install.sh index e9a9b89..79f90a0 100755 --- a/tests-ng/chmod-preserve-install.sh +++ b/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:-}" diff --git a/tests-ng/chmod-preserve-update.sh b/tests-ng/chmod-preserve-update.sh index 8a36bba..919a985 100755 --- a/tests-ng/chmod-preserve-update.sh +++ b/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" diff --git a/tests-ng/chmod-update.sh b/tests-ng/chmod-update.sh index 2e6bc53..d3bc3a3 100755 --- a/tests-ng/chmod-update.sh +++ b/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 ###################### diff --git a/tests-ng/clear-workdir.sh b/tests-ng/clear-workdir.sh index 2f0edf3..ceb4dcf 100755 --- a/tests-ng/clear-workdir.sh +++ b/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:-}" diff --git a/tests-ng/compare-diff-types.sh b/tests-ng/compare-diff-types.sh index ffc68ae..8aa9276 100755 --- a/tests-ng/compare-diff-types.sh +++ b/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:-}" diff --git a/tests-ng/compare-global-negative-ignore.sh b/tests-ng/compare-global-negative-ignore.sh index d23a0de..cdb608d 100755 --- a/tests-ng/compare-global-negative-ignore.sh +++ b/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:-}" diff --git a/tests-ng/compare-ignore-in-dotpath.sh b/tests-ng/compare-ignore-in-dotpath.sh index 554abe2..45617fe 100755 --- a/tests-ng/compare-ignore-in-dotpath.sh +++ b/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:-}" diff --git a/tests-ng/compare-ignore-missing.sh b/tests-ng/compare-ignore-missing.sh index 28210b1..193250b 100755 --- a/tests-ng/compare-ignore-missing.sh +++ b/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:-}" diff --git a/tests-ng/compare-ignore-relative.sh b/tests-ng/compare-ignore-relative.sh index 9fe4d96..9a03089 100755 --- a/tests-ng/compare-ignore-relative.sh +++ b/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:-}" diff --git a/tests-ng/compare-ignore.sh b/tests-ng/compare-ignore.sh index dd8b89c..b51933c 100755 --- a/tests-ng/compare-ignore.sh +++ b/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:-}" diff --git a/tests-ng/compare-include.sh b/tests-ng/compare-include.sh index 3793b0a..ffb58e2 100755 --- a/tests-ng/compare-include.sh +++ b/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:-}" diff --git a/tests-ng/compare-negative-ignore-all-but.sh b/tests-ng/compare-negative-ignore-all-but.sh index 23db920..edd3a4f 100755 --- a/tests-ng/compare-negative-ignore-all-but.sh +++ b/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:-}" diff --git a/tests-ng/compare-negative-ignore-relative.sh b/tests-ng/compare-negative-ignore-relative.sh index 009bc07..211da70 100755 --- a/tests-ng/compare-negative-ignore-relative.sh +++ b/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:-}" diff --git a/tests-ng/compare-negative-ignore.sh b/tests-ng/compare-negative-ignore.sh index 18fe19e..f1fe24f 100755 --- a/tests-ng/compare-negative-ignore.sh +++ b/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) diff --git a/tests-ng/compare-profile-check.sh b/tests-ng/compare-profile-check.sh index 3a934c1..f1cd8f9 100755 --- a/tests-ng/compare-profile-check.sh +++ b/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:-}" diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index 00936f3..0b9e162 100755 --- a/tests-ng/compare.sh +++ b/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:-}" diff --git a/tests-ng/corner-case.sh b/tests-ng/corner-case.sh index c615639..3bba2f1 100755 --- a/tests-ng/corner-case.sh +++ b/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:-}" diff --git a/tests-ng/deprecated-link.sh b/tests-ng/deprecated-link.sh index 6f66c58..f3c5a03 100755 --- a/tests-ng/deprecated-link.sh +++ b/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:-}" diff --git a/tests-ng/diff-cmd.sh b/tests-ng/diff-cmd.sh index 0efdc8f..8f317c4 100755 --- a/tests-ng/diff-cmd.sh +++ b/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:-}" diff --git a/tests-ng/dir-import-update.sh b/tests-ng/dir-import-update.sh index 9c16a4e..62e4b93 100755 --- a/tests-ng/dir-import-update.sh +++ b/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:-}" diff --git a/tests-ng/dotdrop-variables.sh b/tests-ng/dotdrop-variables.sh index 45ecd8d..c14a9c8 100755 --- a/tests-ng/dotdrop-variables.sh +++ b/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:-}" diff --git a/tests-ng/dotfile-no-src.sh b/tests-ng/dotfile-no-src.sh index 484e8da..a3c0f3d 100755 --- a/tests-ng/dotfile-no-src.sh +++ b/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:-}" diff --git a/tests-ng/dotfile-sub-variables.sh b/tests-ng/dotfile-sub-variables.sh index b1ed783..c9313b7 100755 --- a/tests-ng/dotfile-sub-variables.sh +++ b/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:-}" diff --git a/tests-ng/dotfile-variables.sh b/tests-ng/dotfile-variables.sh index f1ef3e2..2c944f7 100755 --- a/tests-ng/dotfile-variables.sh +++ b/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:-}" diff --git a/tests-ng/dotfiles-all.sh b/tests-ng/dotfiles-all.sh index 3860f9f..89ea2f1 100755 --- a/tests-ng/dotfiles-all.sh +++ b/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:-}" diff --git a/tests-ng/dotfiles-dyn-paths.sh b/tests-ng/dotfiles-dyn-paths.sh index 1313ced..97e3da4 100755 --- a/tests-ng/dotfiles-dyn-paths.sh +++ b/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:-}" diff --git a/tests-ng/double-config-import.sh b/tests-ng/double-config-import.sh index 42a6c42..9fe0f5c 100755 --- a/tests-ng/double-config-import.sh +++ b/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:-}" diff --git a/tests-ng/dry.sh b/tests-ng/dry.sh index 331bde6..c7c248a 100755 --- a/tests-ng/dry.sh +++ b/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:-}" diff --git a/tests-ng/duplicate-key.sh b/tests-ng/duplicate-key.sh index 36c55cf..cec8ee9 100755 --- a/tests-ng/duplicate-key.sh +++ b/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:-}" diff --git a/tests-ng/dynactions.sh b/tests-ng/dynactions.sh index 493546a..7c741af 100755 --- a/tests-ng/dynactions.sh +++ b/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:-}" diff --git a/tests-ng/dyndotfilepaths.sh b/tests-ng/dyndotfilepaths.sh index 00eb58f..0b4c94a 100755 --- a/tests-ng/dyndotfilepaths.sh +++ b/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:-}" diff --git a/tests-ng/dynextvariables.sh b/tests-ng/dynextvariables.sh index 945f9b2..c42c01c 100755 --- a/tests-ng/dynextvariables.sh +++ b/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:-}" diff --git a/tests-ng/dyninclude.sh b/tests-ng/dyninclude.sh index f90da67..35dafd6 100755 --- a/tests-ng/dyninclude.sh +++ b/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:-}" diff --git a/tests-ng/dynvariables.sh b/tests-ng/dynvariables.sh index 7976244..59f2f31 100755 --- a/tests-ng/dynvariables.sh +++ b/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:-}" diff --git a/tests-ng/env.sh b/tests-ng/env.sh index 0448054..168b989 100755 --- a/tests-ng/env.sh +++ b/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:-}" diff --git a/tests-ng/ext-actions.sh b/tests-ng/ext-actions.sh index f211782..b82d21b 100755 --- a/tests-ng/ext-actions.sh +++ b/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:-}" diff --git a/tests-ng/extvariables.sh b/tests-ng/extvariables.sh index a426c9a..3aa7b18 100755 --- a/tests-ng/extvariables.sh +++ b/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:-}" diff --git a/tests-ng/filter_file.sh b/tests-ng/filter_file.sh index e6939ad..d33c5a2 100755 --- a/tests-ng/filter_file.sh +++ b/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:-}" diff --git a/tests-ng/force-actions.sh b/tests-ng/force-actions.sh index 55aadd7..68450db 100755 --- a/tests-ng/force-actions.sh +++ b/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:-}" diff --git a/tests-ng/func_file.sh b/tests-ng/func_file.sh index 48a66f3..137f03f 100755 --- a/tests-ng/func_file.sh +++ b/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:-}" diff --git a/tests-ng/global-compare-ignore.sh b/tests-ng/global-compare-ignore.sh index 93723a0..5ddadb2 100755 --- a/tests-ng/global-compare-ignore.sh +++ b/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:-}" diff --git a/tests-ng/global-update-ignore.sh b/tests-ng/global-update-ignore.sh index 06cd0e6..5ee04eb 100755 --- a/tests-ng/global-update-ignore.sh +++ b/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:-}" diff --git a/tests-ng/globs.sh b/tests-ng/globs.sh index f6b068c..5bcf73f 100755 --- a/tests-ng/globs.sh +++ b/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:-}" diff --git a/tests-ng/header.sh b/tests-ng/header.sh index db8f809..46f0c75 100755 --- a/tests-ng/header.sh +++ b/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:-}" diff --git a/tests-ng/helpers b/tests-ng/helpers index de35ca0..551cffa 100644 --- a/tests-ng/helpers +++ b/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=() diff --git a/tests-ng/ignore-empty.sh b/tests-ng/ignore-empty.sh index a047d11..f5cacb2 100755 --- a/tests-ng/ignore-empty.sh +++ b/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:-}" diff --git a/tests-ng/import-as.sh b/tests-ng/import-as.sh index 8b99500..7251391 100755 --- a/tests-ng/import-as.sh +++ b/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:-}" diff --git a/tests-ng/import-configs.sh b/tests-ng/import-configs.sh index e437743..d09e78b 100755 --- a/tests-ng/import-configs.sh +++ b/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:-}" diff --git a/tests-ng/import-configs2.sh b/tests-ng/import-configs2.sh index d6fcf79..be6f618 100755 --- a/tests-ng/import-configs2.sh +++ b/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:-}" diff --git a/tests-ng/import-duplicate.sh b/tests-ng/import-duplicate.sh index 42deb8d..4a09e32 100755 --- a/tests-ng/import-duplicate.sh +++ b/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:-}" diff --git a/tests-ng/import-ignore-in-dotpath.sh b/tests-ng/import-ignore-in-dotpath.sh index d8005c1..2303b07 100755 --- a/tests-ng/import-ignore-in-dotpath.sh +++ b/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:-}" diff --git a/tests-ng/import-ignore.sh b/tests-ng/import-ignore.sh index 3f7a463..a1d1936 100755 --- a/tests-ng/import-ignore.sh +++ b/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:-}" diff --git a/tests-ng/import-include.sh b/tests-ng/import-include.sh index 67d2230..4c7b3b9 100755 --- a/tests-ng/import-include.sh +++ b/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:-}" diff --git a/tests-ng/import-link-children.sh b/tests-ng/import-link-children.sh index abcdb55..fe3836e 100755 --- a/tests-ng/import-link-children.sh +++ b/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:-}" diff --git a/tests-ng/import-negative-ignore-all-but.sh b/tests-ng/import-negative-ignore-all-but.sh index 6408510..a3ec782 100755 --- a/tests-ng/import-negative-ignore-all-but.sh +++ b/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:-}" diff --git a/tests-ng/import-negative-ignore.sh b/tests-ng/import-negative-ignore.sh index 629b85e..37f1aac 100755 --- a/tests-ng/import-negative-ignore.sh +++ b/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:-}" diff --git a/tests-ng/import-non-existing.sh b/tests-ng/import-non-existing.sh index bd5ab3b..fda0721 100755 --- a/tests-ng/import-non-existing.sh +++ b/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:-}" diff --git a/tests-ng/import-profile-dotfiles.sh b/tests-ng/import-profile-dotfiles.sh index 46f2bad..6fd28b2 100755 --- a/tests-ng/import-profile-dotfiles.sh +++ b/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:-}" diff --git a/tests-ng/import-subfile.sh b/tests-ng/import-subfile.sh index 71879a7..a99426e 100755 --- a/tests-ng/import-subfile.sh +++ b/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:-}" diff --git a/tests-ng/import-to-no-profile.sh b/tests-ng/import-to-no-profile.sh index 309baa3..f8b15fe 100755 --- a/tests-ng/import-to-no-profile.sh +++ b/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:-}" diff --git a/tests-ng/import-variables.sh b/tests-ng/import-variables.sh index 89f3f3a..b9d7e73 100755 --- a/tests-ng/import-variables.sh +++ b/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:-}" diff --git a/tests-ng/import-with-empty.sh b/tests-ng/import-with-empty.sh index aed9a4a..e94ac0b 100755 --- a/tests-ng/import-with-empty.sh +++ b/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:-}" diff --git a/tests-ng/import-with-trans.sh b/tests-ng/import-with-trans.sh index eb9c9a2..9634dd9 100755 --- a/tests-ng/import-with-trans.sh +++ b/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:-}" diff --git a/tests-ng/import.sh b/tests-ng/import.sh index f480bab..7d635dc 100755 --- a/tests-ng/import.sh +++ b/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:-}" diff --git a/tests-ng/imported-configs-variables.sh b/tests-ng/imported-configs-variables.sh index b28c226..4934f6b 100755 --- a/tests-ng/imported-configs-variables.sh +++ b/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:-}" diff --git a/tests-ng/imported-variables-from-config.sh b/tests-ng/imported-variables-from-config.sh index 04539e7..4af5460 100755 --- a/tests-ng/imported-variables-from-config.sh +++ b/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:-}" diff --git a/tests-ng/include-actions.sh b/tests-ng/include-actions.sh index d9edcfa..bbe22d5 100755 --- a/tests-ng/include-actions.sh +++ b/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:-}" diff --git a/tests-ng/include-order.sh b/tests-ng/include-order.sh index 490d578..1946768 100755 --- a/tests-ng/include-order.sh +++ b/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:-}" diff --git a/tests-ng/include-variables.sh b/tests-ng/include-variables.sh index 303c011..80d0be5 100755 --- a/tests-ng/include-variables.sh +++ b/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:-}" diff --git a/tests-ng/include.sh b/tests-ng/include.sh index dfcc093..e4c4d77 100755 --- a/tests-ng/include.sh +++ b/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:-}" diff --git a/tests-ng/inst-link-default.sh b/tests-ng/inst-link-default.sh index 8f7a9f5..b356bf3 100755 --- a/tests-ng/inst-link-default.sh +++ b/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:-}" diff --git a/tests-ng/install-and-remove.sh b/tests-ng/install-and-remove.sh index 8d3243d..57d4db9 100755 --- a/tests-ng/install-and-remove.sh +++ b/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:-}" diff --git a/tests-ng/install-empty.sh b/tests-ng/install-empty.sh index c58b263..b38b4ae 100755 --- a/tests-ng/install-empty.sh +++ b/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:-}" diff --git a/tests-ng/install-ignore.sh b/tests-ng/install-ignore.sh index e10777f..f20cd31 100755 --- a/tests-ng/install-ignore.sh +++ b/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:-}" diff --git a/tests-ng/install-link-children.sh b/tests-ng/install-link-children.sh index 5b9aedd..1b7f15d 100755 --- a/tests-ng/install-link-children.sh +++ b/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:-}" diff --git a/tests-ng/install-negative-ignore-all-but.sh b/tests-ng/install-negative-ignore-all-but.sh index 8498303..754a820 100755 --- a/tests-ng/install-negative-ignore-all-but.sh +++ b/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:-}" diff --git a/tests-ng/install-negative-ignore-no-match.sh b/tests-ng/install-negative-ignore-no-match.sh index add5683..7727d8e 100755 --- a/tests-ng/install-negative-ignore-no-match.sh +++ b/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:-}" diff --git a/tests-ng/install-negative-ignore.sh b/tests-ng/install-negative-ignore.sh index 91e1b66..44cff25 100755 --- a/tests-ng/install-negative-ignore.sh +++ b/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:-}" diff --git a/tests-ng/install-to-temp.sh b/tests-ng/install-to-temp.sh index 542d1a9..1852ef8 100755 --- a/tests-ng/install-to-temp.sh +++ b/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:-}" diff --git a/tests-ng/install.sh b/tests-ng/install.sh index f367cb6..113b542 100755 --- a/tests-ng/install.sh +++ b/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:-}" diff --git a/tests-ng/jhelpers.sh b/tests-ng/jhelpers.sh index d2ced8a..8b00e3e 100755 --- a/tests-ng/jhelpers.sh +++ b/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:-}" diff --git a/tests-ng/key-prefix-sep.sh b/tests-ng/key-prefix-sep.sh index bbbcd9d..13185c7 100755 --- a/tests-ng/key-prefix-sep.sh +++ b/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:-}" diff --git a/tests-ng/link-import-default.sh b/tests-ng/link-import-default.sh index 8c57bc0..a1284d7 100755 --- a/tests-ng/link-import-default.sh +++ b/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:-}" diff --git a/tests-ng/link-templates-dir-home.sh b/tests-ng/link-templates-dir-home.sh index 87743fe..abe72d8 100755 --- a/tests-ng/link-templates-dir-home.sh +++ b/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:-}" diff --git a/tests-ng/link-templates-dir.sh b/tests-ng/link-templates-dir.sh index 7adc5d1..20992ec 100755 --- a/tests-ng/link-templates-dir.sh +++ b/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:-}" diff --git a/tests-ng/link-templates.sh b/tests-ng/link-templates.sh index 6107138..85d443c 100755 --- a/tests-ng/link-templates.sh +++ b/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:-}" diff --git a/tests-ng/link-value-tests.sh b/tests-ng/link-value-tests.sh index 5b6a5fc..c92dd33 100755 --- a/tests-ng/link-value-tests.sh +++ b/tests-ng/link-value-tests.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:-}" diff --git a/tests-ng/macro-with-globals.sh b/tests-ng/macro-with-globals.sh index e301a78..e20025d 100755 --- a/tests-ng/macro-with-globals.sh +++ b/tests-ng/macro-with-globals.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:-}" diff --git a/tests-ng/minversion.sh b/tests-ng/minversion.sh index ae4f939..7853d5c 100755 --- a/tests-ng/minversion.sh +++ b/tests-ng/minversion.sh @@ -5,7 +5,7 @@ # test minversion ## start-cookie -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" PPATH="{PYTHONPATH:-}" diff --git a/tests-ng/misc.sh b/tests-ng/misc.sh index e1017ab..38d7a0d 100755 --- a/tests-ng/misc.sh +++ b/tests-ng/misc.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:-}" diff --git a/tests-ng/notemplate.sh b/tests-ng/notemplate.sh index 2f055d8..aa30da9 100755 --- a/tests-ng/notemplate.sh +++ b/tests-ng/notemplate.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:-}" diff --git a/tests-ng/profile-actions.sh b/tests-ng/profile-actions.sh index 0151fc3..0cf1b36 100755 --- a/tests-ng/profile-actions.sh +++ b/tests-ng/profile-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:-}" diff --git a/tests-ng/profile-dyninclude.sh b/tests-ng/profile-dyninclude.sh index b3a13cc..e45792a 100755 --- a/tests-ng/profile-dyninclude.sh +++ b/tests-ng/profile-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:-}" diff --git a/tests-ng/profile-dynvariables.sh b/tests-ng/profile-dynvariables.sh index 06fbe00..ba6cdd2 100755 --- a/tests-ng/profile-dynvariables.sh +++ b/tests-ng/profile-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:-}" diff --git a/tests-ng/profile-import-dotfiles.sh b/tests-ng/profile-import-dotfiles.sh index 00d0ea9..4b3bbea 100755 --- a/tests-ng/profile-import-dotfiles.sh +++ b/tests-ng/profile-import-dotfiles.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:-}" diff --git a/tests-ng/profile-undefined-variables.sh b/tests-ng/profile-undefined-variables.sh index f233bd3..9afba43 100755 --- a/tests-ng/profile-undefined-variables.sh +++ b/tests-ng/profile-undefined-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:-}" diff --git a/tests-ng/re-import.sh b/tests-ng/re-import.sh index d6cd27c..96ffc34 100755 --- a/tests-ng/re-import.sh +++ b/tests-ng/re-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:-}" diff --git a/tests-ng/recinclude.sh b/tests-ng/recinclude.sh index 56cbde9..26f1037 100755 --- a/tests-ng/recinclude.sh +++ b/tests-ng/recinclude.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:-}" diff --git a/tests-ng/recvariables.sh b/tests-ng/recvariables.sh index 86ed3d0..3e3210a 100755 --- a/tests-ng/recvariables.sh +++ b/tests-ng/recvariables.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:-}" diff --git a/tests-ng/remove.sh b/tests-ng/remove.sh index de49065..453448f 100755 --- a/tests-ng/remove.sh +++ b/tests-ng/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:-}" diff --git a/tests-ng/symlink-relative.sh b/tests-ng/symlink-relative.sh index c7ec5f7..fbc54da 100755 --- a/tests-ng/symlink-relative.sh +++ b/tests-ng/symlink-relative.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:-}" diff --git a/tests-ng/symlink.sh b/tests-ng/symlink.sh index 90f2159..b8fa99a 100755 --- a/tests-ng/symlink.sh +++ b/tests-ng/symlink.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:-}" diff --git a/tests-ng/template-dotpath.sh b/tests-ng/template-dotpath.sh index c1fd25b..a90f8a9 100755 --- a/tests-ng/template-dotpath.sh +++ b/tests-ng/template-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:-}" diff --git a/tests-ng/template-link-value.sh b/tests-ng/template-link-value.sh index 8acffe1..31813b5 100755 --- a/tests-ng/template-link-value.sh +++ b/tests-ng/template-link-value.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:-}" diff --git a/tests-ng/template-link.sh b/tests-ng/template-link.sh index 67dfa5d..6b78c58 100755 --- a/tests-ng/template-link.sh +++ b/tests-ng/template-link.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:-}" diff --git a/tests-ng/template-vars-dict.sh b/tests-ng/template-vars-dict.sh index 5d41f7e..6a5e1c3 100755 --- a/tests-ng/template-vars-dict.sh +++ b/tests-ng/template-vars-dict.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:-}" diff --git a/tests-ng/toml.sh b/tests-ng/toml.sh index f7e3146..7a0270c 100755 --- a/tests-ng/toml.sh +++ b/tests-ng/toml.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:-}" diff --git a/tests-ng/transformations-template.sh b/tests-ng/transformations-template.sh index 6fcada6..d4cb722 100755 --- a/tests-ng/transformations-template.sh +++ b/tests-ng/transformations-template.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:-}" diff --git a/tests-ng/transformations-with-args.sh b/tests-ng/transformations-with-args.sh index 694ba85..984f444 100755 --- a/tests-ng/transformations-with-args.sh +++ b/tests-ng/transformations-with-args.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:-}" diff --git a/tests-ng/transformations.sh b/tests-ng/transformations.sh index 0d9009c..d4281bf 100755 --- a/tests-ng/transformations.sh +++ b/tests-ng/transformations.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:-}" diff --git a/tests-ng/uninstall.sh b/tests-ng/uninstall.sh index 67e7439..eba2b97 100755 --- a/tests-ng/uninstall.sh +++ b/tests-ng/uninstall.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:-}" diff --git a/tests-ng/update-global-negative-ignore.sh b/tests-ng/update-global-negative-ignore.sh index e8281cc..95c0699 100755 --- a/tests-ng/update-global-negative-ignore.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-ignore-in-dotpath.sh b/tests-ng/update-ignore-in-dotpath.sh index d647570..9845caa 100755 --- a/tests-ng/update-ignore-in-dotpath.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-ignore-missing.sh b/tests-ng/update-ignore-missing.sh index 151ba78..27d4880 100755 --- a/tests-ng/update-ignore-missing.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-ignore-relative.sh b/tests-ng/update-ignore-relative.sh index 91bfbaf..7a8d42b 100755 --- a/tests-ng/update-ignore-relative.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-ignore.sh b/tests-ng/update-ignore.sh index 0241eff..5128afe 100755 --- a/tests-ng/update-ignore.sh +++ b/tests-ng/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:-}" diff --git a/tests-ng/update-negative-ignore-all-but.sh b/tests-ng/update-negative-ignore-all-but.sh index d378bef..e09f8c6 100755 --- a/tests-ng/update-negative-ignore-all-but.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-negative-ignore-relative.sh b/tests-ng/update-negative-ignore-relative.sh index 5df554e..b48807e 100755 --- a/tests-ng/update-negative-ignore-relative.sh +++ b/tests-ng/update-negative-ignore-relative.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:-}" diff --git a/tests-ng/update-negative-ignore.sh b/tests-ng/update-negative-ignore.sh index 462de55..7346d12 100755 --- a/tests-ng/update-negative-ignore.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-profile-check.sh b/tests-ng/update-profile-check.sh index 1e6f03c..cb43059 100755 --- a/tests-ng/update-profile-check.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-rights.sh b/tests-ng/update-rights.sh index 3cb1858..74f9295 100755 --- a/tests-ng/update-rights.sh +++ b/tests-ng/update-rights.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:-}" diff --git a/tests-ng/update-templates.sh b/tests-ng/update-templates.sh index 6730f05..cac47b2 100755 --- a/tests-ng/update-templates.sh +++ b/tests-ng/update-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:-}" diff --git a/tests-ng/update-with-key.sh b/tests-ng/update-with-key.sh index e290015..3094c61 100755 --- a/tests-ng/update-with-key.sh +++ b/tests-ng/update-with-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:-}" diff --git a/tests-ng/update.sh b/tests-ng/update.sh index 07cc9d7..3d65ade 100755 --- a/tests-ng/update.sh +++ b/tests-ng/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:-}" diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh index 6c8abfa..181b765 100755 --- a/tests-ng/uservariables.sh +++ b/tests-ng/uservariables.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:-}" diff --git a/tests-ng/variables-enrich.sh b/tests-ng/variables-enrich.sh index dd023fa..bb08227 100755 --- a/tests-ng/variables-enrich.sh +++ b/tests-ng/variables-enrich.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:-}" diff --git a/tests-ng/variables-include.sh b/tests-ng/variables-include.sh index 4860ad2..0f3ea25 100755 --- a/tests-ng/variables-include.sh +++ b/tests-ng/variables-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:-}" diff --git a/tests-ng/variables-nested.sh b/tests-ng/variables-nested.sh index 3768e66..648be91 100755 --- a/tests-ng/variables-nested.sh +++ b/tests-ng/variables-nested.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:-}" diff --git a/tests-ng/variables.sh b/tests-ng/variables.sh index 39b51b7..ddf37a1 100755 --- a/tests-ng/variables.sh +++ b/tests-ng/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:-}" diff --git a/tests-ng/workdir-compare.sh b/tests-ng/workdir-compare.sh index be2b578..81b955a 100755 --- a/tests-ng/workdir-compare.sh +++ b/tests-ng/workdir-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:-}" diff --git a/tests-ng/workdir.sh b/tests-ng/workdir.sh index ac4dc1b..c51d38e 100755 --- a/tests-ng/workdir.sh +++ b/tests-ng/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:-}" diff --git a/tests.sh b/tests.sh index 69144de..425f8cf 100755 --- a/tests.sh +++ b/tests.sh @@ -3,8 +3,7 @@ # Copyright (c) 2017, deadc0de6 # stop on first error -#set -euo errtrace pipefailv -set -euo errtrace pipefail +set -eu -o errtrace -o pipefail cur=$(cd "$(dirname "${0}")" && pwd)