tests refactoring

bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # author: deadc0de6 (https://github.com/deadc0de6)
 # Copyright (c) 2017, deadc0de6
 

completion/generate.sh

@@ -5,7 +5,7 @@
 # pip3 install --user infi.docopt_completion
 #
 
-set -e
+set -euo errtrace pipefail
 
 bin="docopt-completion"
 if ! hash ${bin}; then

dotdrop.sh

@@ -27,7 +27,7 @@ else
   # virtualenv
   pybin="${ENV_DIR}/bin/python"
 fi
-hash "${pybin}" 2>/dev/null || (echo "python executable not found" && exit 1)
+hash "${pybin}" 2>/dev/null || { echo "python executable not found" && exit 1; }
 
 # launch dotdrop
 PYTHONPATH=dotdrop:${PYTHONPATH} ${pybin} -m dotdrop.dotdrop "${args[@]}"

packages/genpkg.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # author: deadc0de6
 #
 # update packages

scripts/check-doc.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # author: deadc0de6 (https://github.com/deadc0de6)
 # Copyright (c) 2022, deadc0de6
 
 # stop on first error
-set -e
+set -euo errtrace pipefail
 
 ## test doc external links
 echo "------------------------"
@@ -16,11 +16,7 @@ done
 ## https://github.com/remarkjs/remark-validate-links
 ## https://github.com/tcort/markdown-link-check
 ## npm install -g remark-cli remark-validate-links
-set +e
-which remark >/dev/null 2>&1
-r="$?"
-set -e
-if [ "$r" != "0" ]; then
+if ! which remark >/dev/null 2>&1; then
   echo "[WARNING] install \"remark\" to test the doc"
   exit 1
 fi

scripts/check-syntax.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # author: deadc0de6 (https://github.com/deadc0de6)
 # Copyright (c) 2022, deadc0de6
 
 # stop on first error
-set -e
+set -euo errtrace pipefail
 
 # ensure binaries are here
 if ! which shellcheck >/dev/null 2>&1; then
@@ -43,6 +43,14 @@ grep -rv 'TODO\|FIXME' tests/ >/dev/null 2>&1
 grep -rv 'TODO\|FIXME' tests-ng/ >/dev/null 2>&1
 grep -rv 'TODO\|FIXME' scripts/ >/dev/null 2>&1
 
+# checking for tests options
+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 \-euxo errtrace pipefailuxo errtrace pipefail' "${script}" || (echo "set -euo errtrace pipefail not set in ${script}" && exit 1 )
+done
+
 # PEP8 tests
 # W503: Line break occurred before a binary operator
 # W504: Line break occurred after a binary operator
@@ -114,11 +122,9 @@ done
 
 echo "------------------------"
 echo "checking for more issues"
-set +e
 exceptions="save_uservariables_name\|@@\|diff_cmd\|original,\|modified,"
 # f-string errors and missing f literal
 find dotdrop/ -iname '*.py' -exec grep --with-filename -n -v "f'" {} \; | grep -v "{'" | grep -v "${exceptions}" | grep "'.*}" && echo "bad string format (1)" && exit 1
 find dotdrop/ -iname '*.py' -exec grep --with-filename -n -v 'f"' {} \; | grep -v "f'" | grep -v '{"' | grep -v "${exceptions}" | grep '".*}' && echo "bad string format (2)" && exit 1
-set -e
 
 echo "syntax OK"

scripts/check-tests-ng.sh

@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # author: deadc0de6 (https://github.com/deadc0de6)
 # Copyright (c) 2023, deadc0de6
 
 # stop on first error
-set -e
+set -euo errtrace pipefail
 
 tmpworkdir="/tmp/dotdrop-tests-workdir"
 export DOTDROP_WORKDIR="${tmpworkdir}"
@@ -13,7 +13,8 @@ workdir_tmp_exists="no"
 [ -d "${HOME}/.config/dotdrop/tmp" ] && workdir_tmp_exists="yes"
 
 # run bash tests
-if [ -z "${GITHUB_WORKFLOW}" ]; then
+GH_WORKFLOW=${GITHUB_WORKFLOW:-}
+if [ -z "${GH_WORKFLOW}" ]; then
   ## local
   tests-ng/tests_launcher.py -s
 else
@@ -27,3 +28,5 @@ fi
 [ "${workdir_tmp_exists}" = "no" ] && rm -rf ~/.config/dotdrop/tmp
 # clear temp workdir
 rm -rf "${tmpworkdir}"
+
+echo "tests-ng done"

scripts/check-unittests.sh

@@ -1,11 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # author: deadc0de6 (https://github.com/deadc0de6)
 # Copyright (c) 2023, deadc0de6
 
 # stop on first error
-set -e
+set -euo errtrace pipefail
 
-if [ -n "${DOTDROP_WORKERS}" ]; then
+WORKERS=${DOTDROP_WORKERS:-}
+if [ -n "${WORKERS}" ]; then
   unset DOTDROP_WORKERS
   echo "DISABLE workers for unittests"
 fi

tests-ng/actions-args-template.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions-args.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions-default.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions-empty-dir.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions-pre.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions-template.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/actions.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/bad-diff-cmd.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/
@@ -42,12 +43,13 @@ dotfiles:
 profiles:
 _EOF
 
+# check diff command is reported as error
 set +e
 cd "${ddpath}" | ${bin} compare -c "${cfg}"
 [ "$?" = "0" ] && exit 1
-
 out=$(cd "${ddpath}" | ${bin} compare -c "${cfg}")
 echo "${out}" | grep -i 'traceback' && exit 1
+set -e
 
 cat > "${cfg}" << _EOF
 config:
@@ -59,12 +61,13 @@ dotfiles:
 profiles:
 _EOF
 
+# should fail
 set +e
 cd "${ddpath}" | ${bin} compare -c "${cfg}"
 [ "$?" = "0" ] && exit 1
-
 out=$(cd "${ddpath}" | ${bin} compare -c "${cfg}")
 echo "${out}" | grep -i 'traceback' && exit 1
+set -e
 
 echo "OK"
 exit 0

tests-ng/chmod-compare.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-import.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-install.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-more.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-preserve-install.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-preserve-update.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/chmod-update.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/clear-workdir.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-diff-types.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-ignore-missing.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-ignore-relative.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-ignore.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-include.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare-negative-ignore.sh

@@ -7,7 +7,7 @@
 #
 
 # exit on first error
-#set -e
+#set -euo errtrace pipefail
 
 cur=$(cd "$(dirname "${0}")" && pwd)
 
@@ -16,7 +16,8 @@ ddpath="${cur}/../"
 [ -n "${1}" ] && ddpath="${1}"
 [ ! -d "${ddpath}" ] && echo "ddpath \"${ddpath}\" is not a directory" && exit 1
 
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 bin="python3 -m dotdrop.dotdrop"
 
 echo "dotdrop path: ${ddpath}"

tests-ng/compare-profile-check.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/compare.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/corner-case.sh

@@ -12,10 +12,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/deprecated-link.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/diff-cmd.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dir-import-update.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotdrop-variables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotfile-no-src.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotfile-sub-variables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotfile-variables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotfiles-all.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dotfiles-dyn-paths.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/double-config-import.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dry.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/duplicate-key.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dynactions.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dyndotfilepaths.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dynextvariables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dyninclude.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/dynvariables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/
@@ -40,7 +41,7 @@ clear_on_exit "${tmpd}"
 export TESTENV="this is my testenv"
 scr=$(mktemp --suffix='-dotdrop-tests' || mktemp -d)
 chmod +x "${scr}"
-echo -e "#!/bin/bash\necho $TESTENV\n" >> "${scr}"
+echo -e "#!/usr/bin/env bash\necho $TESTENV\n" >> "${scr}"
 clear_on_exit "${scr}"
 
 # create the config file

tests-ng/env.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/ext-actions.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/extvariables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/filter_file.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/force-actions.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/func_file.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/global-compare-ignore.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/global-update-ignore.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/globs.sh

@@ -10,10 +10,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/header.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/helpers

@@ -6,7 +6,10 @@
 #
 # 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
 
-declare -a to_be_cleared
+set -euo errtrace pipefail
+
+#declare -a to_be_cleared
+to_be_cleared=()
 
 # add a file/directory to be cleared
 # on exit
@@ -109,7 +112,8 @@ fi
 # workdir tricks
 # when tests are called without using the
 # top level tests.sh script which sets the workdir
-if [ -z "${DOTDROP_WORKDIR}" ]; then
+DD_WORKDIR=${DOTDROP_WORKDIR:-}
+if [ -z "${DD_WORKDIR}" ]; then
   _workdir="/tmp/dotdrop-test-workdir"
   export DOTDROP_WORKDIR="${_workdir}"
   clear_on_exit "${_workdir}"

tests-ng/ignore-empty.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-as.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-configs.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-configs2.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-duplicate.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-ignore.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-include.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-link-children.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-negative-ignore.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-non-existing.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-profile-dotfiles.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-subfile.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-variables.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-with-empty.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import-with-trans.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/import.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/imported-configs-variables.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/include-actions.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/include-order.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/include-variables.sh

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/include.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/inst-link-default.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install-empty.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install-ignore.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install-link-children.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

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

@@ -8,10 +8,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install-negative-ignore.sh

@@ -6,10 +6,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install-to-temp.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/install.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/

tests-ng/jhelpers.sh

@@ -7,10 +7,11 @@
 #
 
 ## start-cookie
-set -e
+set -euo errtrace pipefail
 cur=$(cd "$(dirname "${0}")" && pwd)
 ddpath="${cur}/../"
-export PYTHONPATH="${ddpath}:${PYTHONPATH}"
+PPATH="{PYTHONPATH:-}"
+export PYTHONPATH="${ddpath}:${PPATH}"
 altbin="python3 -m dotdrop.dotdrop"
 if hash coverage 2>/dev/null; then
   mkdir -p coverages/