From 7fdd2deacbd01cce76a414f2156125394af8a940 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Tue, 11 Apr 2023 21:34:49 +0200 Subject: [PATCH] drop readlink req --- completion/generate.sh | 12 +----------- docs/installation.md | 2 -- dotdrop.sh | 14 +------------- manpage/generate.sh | 9 +-------- packages/genpkg.sh | 11 +---------- 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/bad-diff-cmd.sh | 2 +- tests-ng/chmod-compare.sh | 2 +- tests-ng/chmod-import.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 | 2 +- tests-ng/chmod-update.sh | 2 +- tests-ng/clear-workdir.sh | 2 +- tests-ng/compare-diff-types.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-relative.sh | 2 +- tests-ng/compare-negative-ignore.sh | 11 +---------- 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-compare-negative-ignore.sh | 2 +- tests-ng/global-update-ignore.sh | 2 +- tests-ng/global-update-negative-ignore.sh | 2 +- tests-ng/globs.sh | 2 +- tests-ng/header.sh | 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.sh | 2 +- tests-ng/import-include.sh | 2 +- tests-ng/import-link-children.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-empty.sh | 2 +- tests-ng/install-ignore.sh | 2 +- tests-ng/install-link-children.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/negative-ignore-no-match.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/toml.sh | 2 +- tests-ng/transformations-template.sh | 2 +- tests-ng/transformations-with-args.sh | 2 +- tests-ng/transformations.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-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.sh | 2 +- tests-ng/workdir-compare.sh | 2 +- tests-ng/workdir.sh | 2 +- tests.sh | 10 +--------- 136 files changed, 135 insertions(+), 192 deletions(-) diff --git a/completion/generate.sh b/completion/generate.sh index d538643..c49bac8 100755 --- a/completion/generate.sh +++ b/completion/generate.sh @@ -13,17 +13,7 @@ if ! hash ${bin}; then exit 1 fi -rl="readlink -f" -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" - exit 1 - fi -fi - -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) opwd=$(pwd) # output files diff --git a/docs/installation.md b/docs/installation.md index b4686c4..4059a77 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -223,11 +223,9 @@ dotdrop depends on the following tools: * `diff` (unless a different tool is used, see [diff_command](config/config-config.md#config-block)) * `git` (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh)) -* `readlink` or `realpath` (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh)) For macOS users, make sure to install the below packages through [Homebrew](https://brew.sh/): -* [coreutils](https://formulae.brew.sh/formula/coreutils) (only if using the entry point script [dotdrop.sh](https://github.com/deadc0de6/dotdrop/blob/master/dotdrop.sh) which uses realpath) * [libmagic](https://formulae.brew.sh/formula/libmagic) (for python-magic) For WSL (Windows Subsystem for Linux), make sure to install `python-magic-bin`: diff --git a/dotdrop.sh b/dotdrop.sh index 9dc2a33..a4b86e5 100755 --- a/dotdrop.sh +++ b/dotdrop.sh @@ -2,21 +2,9 @@ # author: deadc0de6 (https://github.com/deadc0de6) # Copyright (c) 2017, deadc0de6 -# check for readlink/realpath presence -# https://github.com/deadc0de6/dotdrop/issues/6 -rl="readlink -f" - -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi - # setup variables args=("$@") -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) opwd=$(pwd) # pivot diff --git a/manpage/generate.sh b/manpage/generate.sh index b47a904..92a9398 100755 --- a/manpage/generate.sh +++ b/manpage/generate.sh @@ -3,14 +3,7 @@ # Copyright (c) 2023, deadc0de6 # get current working directory -rl="readlink -f" -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) # extract version from git latest tag #version=$(git describe --tags --abbrev=0) diff --git a/packages/genpkg.sh b/packages/genpkg.sh index b94dc8c..f4916a6 100755 --- a/packages/genpkg.sh +++ b/packages/genpkg.sh @@ -15,16 +15,7 @@ up() } # pivot -rl="readlink -f" -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi -# cur -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) opwd=$(pwd) pkgfile="PKGBUILD" cd "${cur}" || exit 1 diff --git a/tests-ng/actions-args-template.sh b/tests-ng/actions-args-template.sh index 23cfebf..f4c10c7 100755 --- a/tests-ng/actions-args-template.sh +++ b/tests-ng/actions-args-template.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions-args.sh b/tests-ng/actions-args.sh index c244744..8ae14c3 100755 --- a/tests-ng/actions-args.sh +++ b/tests-ng/actions-args.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions-default.sh b/tests-ng/actions-default.sh index 0c00493..da1d01c 100755 --- a/tests-ng/actions-default.sh +++ b/tests-ng/actions-default.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions-empty-dir.sh b/tests-ng/actions-empty-dir.sh index 2d5152f..689393a 100755 --- a/tests-ng/actions-empty-dir.sh +++ b/tests-ng/actions-empty-dir.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions-pre.sh b/tests-ng/actions-pre.sh index fc7e51a..91226c2 100755 --- a/tests-ng/actions-pre.sh +++ b/tests-ng/actions-pre.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions-template.sh b/tests-ng/actions-template.sh index 987158e..2746eae 100755 --- a/tests-ng/actions-template.sh +++ b/tests-ng/actions-template.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/actions.sh b/tests-ng/actions.sh index 513592a..b7281b8 100755 --- a/tests-ng/actions.sh +++ b/tests-ng/actions.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/bad-diff-cmd.sh b/tests-ng/bad-diff-cmd.sh index 523586c..5802102 100755 --- a/tests-ng/bad-diff-cmd.sh +++ b/tests-ng/bad-diff-cmd.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-compare.sh b/tests-ng/chmod-compare.sh index 1c26360..1e07bdf 100755 --- a/tests-ng/chmod-compare.sh +++ b/tests-ng/chmod-compare.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-import.sh b/tests-ng/chmod-import.sh index 70c1310..c67798e 100755 --- a/tests-ng/chmod-import.sh +++ b/tests-ng/chmod-import.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-install.sh b/tests-ng/chmod-install.sh index 3e5ec6c..7cfab4e 100755 --- a/tests-ng/chmod-install.sh +++ b/tests-ng/chmod-install.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-more.sh b/tests-ng/chmod-more.sh index 42412e1..51c3971 100755 --- a/tests-ng/chmod-more.sh +++ b/tests-ng/chmod-more.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-preserve-install.sh b/tests-ng/chmod-preserve-install.sh index d59638b..af8e5c0 100755 --- a/tests-ng/chmod-preserve-install.sh +++ b/tests-ng/chmod-preserve-install.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-preserve-update.sh b/tests-ng/chmod-preserve-update.sh index 3a91d2d..366447e 100755 --- a/tests-ng/chmod-preserve-update.sh +++ b/tests-ng/chmod-preserve-update.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/chmod-update.sh b/tests-ng/chmod-update.sh index 99ca84e..85773cc 100755 --- a/tests-ng/chmod-update.sh +++ b/tests-ng/chmod-update.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/clear-workdir.sh b/tests-ng/clear-workdir.sh index 3fc213a..af63b70 100755 --- a/tests-ng/clear-workdir.sh +++ b/tests-ng/clear-workdir.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-diff-types.sh b/tests-ng/compare-diff-types.sh index 8789859..9e76b68 100755 --- a/tests-ng/compare-diff-types.sh +++ b/tests-ng/compare-diff-types.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-ignore-missing.sh b/tests-ng/compare-ignore-missing.sh index afd7288..d7b70f5 100755 --- a/tests-ng/compare-ignore-missing.sh +++ b/tests-ng/compare-ignore-missing.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-ignore-relative.sh b/tests-ng/compare-ignore-relative.sh index 0c075d4..2fe84e9 100755 --- a/tests-ng/compare-ignore-relative.sh +++ b/tests-ng/compare-ignore-relative.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-ignore.sh b/tests-ng/compare-ignore.sh index 0cf6b3e..5f90182 100755 --- a/tests-ng/compare-ignore.sh +++ b/tests-ng/compare-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-include.sh b/tests-ng/compare-include.sh index abd1fd8..137abd5 100755 --- a/tests-ng/compare-include.sh +++ b/tests-ng/compare-include.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-negative-ignore-relative.sh b/tests-ng/compare-negative-ignore-relative.sh index e6a0c5e..ea4aaec 100755 --- a/tests-ng/compare-negative-ignore-relative.sh +++ b/tests-ng/compare-negative-ignore-relative.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare-negative-ignore.sh b/tests-ng/compare-negative-ignore.sh index 4ee3955..facbb23 100755 --- a/tests-ng/compare-negative-ignore.sh +++ b/tests-ng/compare-negative-ignore.sh @@ -8,16 +8,7 @@ # exit on first error #set -e -# all this crap to get current path -rl="readlink -f" -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found !" && exit 1 - fi -fi -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) # dotdrop path can be pass as argument ddpath="${cur}/../" diff --git a/tests-ng/compare-profile-check.sh b/tests-ng/compare-profile-check.sh index da0b2dd..9c38b93 100755 --- a/tests-ng/compare-profile-check.sh +++ b/tests-ng/compare-profile-check.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index 7fabb7e..4e05197 100755 --- a/tests-ng/compare.sh +++ b/tests-ng/compare.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/corner-case.sh b/tests-ng/corner-case.sh index 5e8a816..dc34f87 100755 --- a/tests-ng/corner-case.sh +++ b/tests-ng/corner-case.sh @@ -13,7 +13,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/deprecated-link.sh b/tests-ng/deprecated-link.sh index 0f002fa..71cec7c 100755 --- a/tests-ng/deprecated-link.sh +++ b/tests-ng/deprecated-link.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/diff-cmd.sh b/tests-ng/diff-cmd.sh index de52009..792d95f 100755 --- a/tests-ng/diff-cmd.sh +++ b/tests-ng/diff-cmd.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dir-import-update.sh b/tests-ng/dir-import-update.sh index dba5313..919347d 100755 --- a/tests-ng/dir-import-update.sh +++ b/tests-ng/dir-import-update.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotdrop-variables.sh b/tests-ng/dotdrop-variables.sh index 960879d..2a7f796 100755 --- a/tests-ng/dotdrop-variables.sh +++ b/tests-ng/dotdrop-variables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotfile-no-src.sh b/tests-ng/dotfile-no-src.sh index c497065..80778bf 100755 --- a/tests-ng/dotfile-no-src.sh +++ b/tests-ng/dotfile-no-src.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotfile-sub-variables.sh b/tests-ng/dotfile-sub-variables.sh index a996c18..cc7ffd5 100755 --- a/tests-ng/dotfile-sub-variables.sh +++ b/tests-ng/dotfile-sub-variables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotfile-variables.sh b/tests-ng/dotfile-variables.sh index 476c0e0..c29deaf 100755 --- a/tests-ng/dotfile-variables.sh +++ b/tests-ng/dotfile-variables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotfiles-all.sh b/tests-ng/dotfiles-all.sh index 694c9b4..1e1cb0b 100755 --- a/tests-ng/dotfiles-all.sh +++ b/tests-ng/dotfiles-all.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dotfiles-dyn-paths.sh b/tests-ng/dotfiles-dyn-paths.sh index 2c6247b..0a10301 100755 --- a/tests-ng/dotfiles-dyn-paths.sh +++ b/tests-ng/dotfiles-dyn-paths.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/double-config-import.sh b/tests-ng/double-config-import.sh index 360c5b6..ab45f2f 100755 --- a/tests-ng/double-config-import.sh +++ b/tests-ng/double-config-import.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dry.sh b/tests-ng/dry.sh index 1237b1c..df54e82 100755 --- a/tests-ng/dry.sh +++ b/tests-ng/dry.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/duplicate-key.sh b/tests-ng/duplicate-key.sh index 7c4505d..44011f0 100755 --- a/tests-ng/duplicate-key.sh +++ b/tests-ng/duplicate-key.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dynactions.sh b/tests-ng/dynactions.sh index 1da63bd..ba363f4 100755 --- a/tests-ng/dynactions.sh +++ b/tests-ng/dynactions.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dyndotfilepaths.sh b/tests-ng/dyndotfilepaths.sh index 3de3811..6034d36 100755 --- a/tests-ng/dyndotfilepaths.sh +++ b/tests-ng/dyndotfilepaths.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dynextvariables.sh b/tests-ng/dynextvariables.sh index bf03cdd..d788cbe 100755 --- a/tests-ng/dynextvariables.sh +++ b/tests-ng/dynextvariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dyninclude.sh b/tests-ng/dyninclude.sh index ad24e75..86367d6 100755 --- a/tests-ng/dyninclude.sh +++ b/tests-ng/dyninclude.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/dynvariables.sh b/tests-ng/dynvariables.sh index 0ab8c85..42f0ccd 100755 --- a/tests-ng/dynvariables.sh +++ b/tests-ng/dynvariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/env.sh b/tests-ng/env.sh index 5b77425..aa6415a 100755 --- a/tests-ng/env.sh +++ b/tests-ng/env.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/ext-actions.sh b/tests-ng/ext-actions.sh index c7d923b..21bab53 100755 --- a/tests-ng/ext-actions.sh +++ b/tests-ng/ext-actions.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/extvariables.sh b/tests-ng/extvariables.sh index ef74c44..57c8356 100755 --- a/tests-ng/extvariables.sh +++ b/tests-ng/extvariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/filter_file.sh b/tests-ng/filter_file.sh index 8bdcc8a..7613112 100755 --- a/tests-ng/filter_file.sh +++ b/tests-ng/filter_file.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/force-actions.sh b/tests-ng/force-actions.sh index 419f4ff..97fa63d 100755 --- a/tests-ng/force-actions.sh +++ b/tests-ng/force-actions.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/func_file.sh b/tests-ng/func_file.sh index 8196293..a760cba 100755 --- a/tests-ng/func_file.sh +++ b/tests-ng/func_file.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/global-compare-ignore.sh b/tests-ng/global-compare-ignore.sh index 8fcc54f..4f3bc8e 100755 --- a/tests-ng/global-compare-ignore.sh +++ b/tests-ng/global-compare-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/global-compare-negative-ignore.sh b/tests-ng/global-compare-negative-ignore.sh index e2c5220..0c09a34 100755 --- a/tests-ng/global-compare-negative-ignore.sh +++ b/tests-ng/global-compare-negative-ignore.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/global-update-ignore.sh b/tests-ng/global-update-ignore.sh index 22985ce..48856f2 100755 --- a/tests-ng/global-update-ignore.sh +++ b/tests-ng/global-update-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/global-update-negative-ignore.sh b/tests-ng/global-update-negative-ignore.sh index 4d6b70b..14793e1 100755 --- a/tests-ng/global-update-negative-ignore.sh +++ b/tests-ng/global-update-negative-ignore.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/globs.sh b/tests-ng/globs.sh index 46bf949..f2d77de 100755 --- a/tests-ng/globs.sh +++ b/tests-ng/globs.sh @@ -11,7 +11,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/header.sh b/tests-ng/header.sh index e5b2384..6cc5278 100755 --- a/tests-ng/header.sh +++ b/tests-ng/header.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/ignore-empty.sh b/tests-ng/ignore-empty.sh index 603ecff..6670289 100755 --- a/tests-ng/ignore-empty.sh +++ b/tests-ng/ignore-empty.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-as.sh b/tests-ng/import-as.sh index dc34b95..e12c362 100755 --- a/tests-ng/import-as.sh +++ b/tests-ng/import-as.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-configs.sh b/tests-ng/import-configs.sh index daec69e..4b4f829 100755 --- a/tests-ng/import-configs.sh +++ b/tests-ng/import-configs.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-configs2.sh b/tests-ng/import-configs2.sh index 9423b4c..215bad3 100755 --- a/tests-ng/import-configs2.sh +++ b/tests-ng/import-configs2.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-duplicate.sh b/tests-ng/import-duplicate.sh index f377632..dedcfff 100755 --- a/tests-ng/import-duplicate.sh +++ b/tests-ng/import-duplicate.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-ignore.sh b/tests-ng/import-ignore.sh index 1ca1b74..50be7bf 100755 --- a/tests-ng/import-ignore.sh +++ b/tests-ng/import-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-include.sh b/tests-ng/import-include.sh index b74370f..76a6cc9 100755 --- a/tests-ng/import-include.sh +++ b/tests-ng/import-include.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-link-children.sh b/tests-ng/import-link-children.sh index 1a804d7..5cfea67 100755 --- a/tests-ng/import-link-children.sh +++ b/tests-ng/import-link-children.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-negative-ignore.sh b/tests-ng/import-negative-ignore.sh index df2c757..d761381 100755 --- a/tests-ng/import-negative-ignore.sh +++ b/tests-ng/import-negative-ignore.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-non-existing.sh b/tests-ng/import-non-existing.sh index 0c32dc1..a9a21d1 100755 --- a/tests-ng/import-non-existing.sh +++ b/tests-ng/import-non-existing.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-profile-dotfiles.sh b/tests-ng/import-profile-dotfiles.sh index 9863b80..212c3f0 100755 --- a/tests-ng/import-profile-dotfiles.sh +++ b/tests-ng/import-profile-dotfiles.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-subfile.sh b/tests-ng/import-subfile.sh index fe9cf5f..bc3f55b 100755 --- a/tests-ng/import-subfile.sh +++ b/tests-ng/import-subfile.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-to-no-profile.sh b/tests-ng/import-to-no-profile.sh index d4b0af0..82ff737 100755 --- a/tests-ng/import-to-no-profile.sh +++ b/tests-ng/import-to-no-profile.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-variables.sh b/tests-ng/import-variables.sh index 1972791..2b68276 100755 --- a/tests-ng/import-variables.sh +++ b/tests-ng/import-variables.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-with-empty.sh b/tests-ng/import-with-empty.sh index 5aba9bb..8caeda4 100755 --- a/tests-ng/import-with-empty.sh +++ b/tests-ng/import-with-empty.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import-with-trans.sh b/tests-ng/import-with-trans.sh index ea9f5ce..572b636 100755 --- a/tests-ng/import-with-trans.sh +++ b/tests-ng/import-with-trans.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/import.sh b/tests-ng/import.sh index 69e127a..ea7d4bd 100755 --- a/tests-ng/import.sh +++ b/tests-ng/import.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/imported-configs-variables.sh b/tests-ng/imported-configs-variables.sh index 5c69d86..37b7b23 100755 --- a/tests-ng/imported-configs-variables.sh +++ b/tests-ng/imported-configs-variables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/imported-variables-from-config.sh b/tests-ng/imported-variables-from-config.sh index f5eaf89..9f078b1 100755 --- a/tests-ng/imported-variables-from-config.sh +++ b/tests-ng/imported-variables-from-config.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/include-actions.sh b/tests-ng/include-actions.sh index e02189c..7b7cbda 100755 --- a/tests-ng/include-actions.sh +++ b/tests-ng/include-actions.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/include-order.sh b/tests-ng/include-order.sh index 1f2f0c7..f9435d0 100755 --- a/tests-ng/include-order.sh +++ b/tests-ng/include-order.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/include-variables.sh b/tests-ng/include-variables.sh index a575e33..fb46743 100755 --- a/tests-ng/include-variables.sh +++ b/tests-ng/include-variables.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/include.sh b/tests-ng/include.sh index 6aba573..f120805 100755 --- a/tests-ng/include.sh +++ b/tests-ng/include.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/inst-link-default.sh b/tests-ng/inst-link-default.sh index 8cca8e7..c5bee54 100755 --- a/tests-ng/inst-link-default.sh +++ b/tests-ng/inst-link-default.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install-empty.sh b/tests-ng/install-empty.sh index 747919a..8addee6 100755 --- a/tests-ng/install-empty.sh +++ b/tests-ng/install-empty.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install-ignore.sh b/tests-ng/install-ignore.sh index fbfbf3c..ce46cb7 100755 --- a/tests-ng/install-ignore.sh +++ b/tests-ng/install-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install-link-children.sh b/tests-ng/install-link-children.sh index 9737bfd..f6b03b8 100755 --- a/tests-ng/install-link-children.sh +++ b/tests-ng/install-link-children.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install-negative-ignore.sh b/tests-ng/install-negative-ignore.sh index 8a213c4..95b87c0 100755 --- a/tests-ng/install-negative-ignore.sh +++ b/tests-ng/install-negative-ignore.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install-to-temp.sh b/tests-ng/install-to-temp.sh index dbac419..c8069f6 100755 --- a/tests-ng/install-to-temp.sh +++ b/tests-ng/install-to-temp.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/install.sh b/tests-ng/install.sh index 71b3a3e..21bf8ed 100755 --- a/tests-ng/install.sh +++ b/tests-ng/install.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/jhelpers.sh b/tests-ng/jhelpers.sh index 2e20a52..86c54a2 100755 --- a/tests-ng/jhelpers.sh +++ b/tests-ng/jhelpers.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/key-prefix-sep.sh b/tests-ng/key-prefix-sep.sh index b0c549a..67df4aa 100755 --- a/tests-ng/key-prefix-sep.sh +++ b/tests-ng/key-prefix-sep.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/link-import-default.sh b/tests-ng/link-import-default.sh index 972c520..72769cf 100755 --- a/tests-ng/link-import-default.sh +++ b/tests-ng/link-import-default.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/link-templates-dir-home.sh b/tests-ng/link-templates-dir-home.sh index 3da73de..60224cf 100755 --- a/tests-ng/link-templates-dir-home.sh +++ b/tests-ng/link-templates-dir-home.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/link-templates-dir.sh b/tests-ng/link-templates-dir.sh index 91a66b4..65d9dcb 100755 --- a/tests-ng/link-templates-dir.sh +++ b/tests-ng/link-templates-dir.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/link-templates.sh b/tests-ng/link-templates.sh index f987b81..fb63fdf 100755 --- a/tests-ng/link-templates.sh +++ b/tests-ng/link-templates.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/link-value-tests.sh b/tests-ng/link-value-tests.sh index 17598fd..682be82 100755 --- a/tests-ng/link-value-tests.sh +++ b/tests-ng/link-value-tests.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/macro-with-globals.sh b/tests-ng/macro-with-globals.sh index 0c1a992..7c4446e 100755 --- a/tests-ng/macro-with-globals.sh +++ b/tests-ng/macro-with-globals.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/minversion.sh b/tests-ng/minversion.sh index b6842f9..21c44ef 100755 --- a/tests-ng/minversion.sh +++ b/tests-ng/minversion.sh @@ -6,7 +6,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/misc.sh b/tests-ng/misc.sh index f5afb1c..281dcb0 100755 --- a/tests-ng/misc.sh +++ b/tests-ng/misc.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/negative-ignore-no-match.sh b/tests-ng/negative-ignore-no-match.sh index df9ed07..14b05b0 100755 --- a/tests-ng/negative-ignore-no-match.sh +++ b/tests-ng/negative-ignore-no-match.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/notemplate.sh b/tests-ng/notemplate.sh index c60cefa..7f5b6ae 100755 --- a/tests-ng/notemplate.sh +++ b/tests-ng/notemplate.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/profile-actions.sh b/tests-ng/profile-actions.sh index bde4c12..5d78809 100755 --- a/tests-ng/profile-actions.sh +++ b/tests-ng/profile-actions.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/profile-dyninclude.sh b/tests-ng/profile-dyninclude.sh index 02378d3..239d515 100755 --- a/tests-ng/profile-dyninclude.sh +++ b/tests-ng/profile-dyninclude.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/profile-dynvariables.sh b/tests-ng/profile-dynvariables.sh index 804d286..5ed42db 100755 --- a/tests-ng/profile-dynvariables.sh +++ b/tests-ng/profile-dynvariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/profile-import-dotfiles.sh b/tests-ng/profile-import-dotfiles.sh index ac5cf1a..8101bbf 100755 --- a/tests-ng/profile-import-dotfiles.sh +++ b/tests-ng/profile-import-dotfiles.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/profile-undefined-variables.sh b/tests-ng/profile-undefined-variables.sh index 4bc8efa..a1f7d72 100755 --- a/tests-ng/profile-undefined-variables.sh +++ b/tests-ng/profile-undefined-variables.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/re-import.sh b/tests-ng/re-import.sh index 3664072..6a7a5f9 100755 --- a/tests-ng/re-import.sh +++ b/tests-ng/re-import.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/recinclude.sh b/tests-ng/recinclude.sh index fae98d5..08cf851 100755 --- a/tests-ng/recinclude.sh +++ b/tests-ng/recinclude.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/recvariables.sh b/tests-ng/recvariables.sh index da99512..d90d7a2 100755 --- a/tests-ng/recvariables.sh +++ b/tests-ng/recvariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/remove.sh b/tests-ng/remove.sh index cdc1841..1d15233 100755 --- a/tests-ng/remove.sh +++ b/tests-ng/remove.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/symlink-relative.sh b/tests-ng/symlink-relative.sh index 6e32dbc..aaf53ec 100755 --- a/tests-ng/symlink-relative.sh +++ b/tests-ng/symlink-relative.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/symlink.sh b/tests-ng/symlink.sh index a145cd2..5f0a374 100755 --- a/tests-ng/symlink.sh +++ b/tests-ng/symlink.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/template-dotpath.sh b/tests-ng/template-dotpath.sh index 0860add..5dfa857 100755 --- a/tests-ng/template-dotpath.sh +++ b/tests-ng/template-dotpath.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/template-link-value.sh b/tests-ng/template-link-value.sh index 5b31444..5aaa7dd 100755 --- a/tests-ng/template-link-value.sh +++ b/tests-ng/template-link-value.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/toml.sh b/tests-ng/toml.sh index 792988d..3a99c00 100755 --- a/tests-ng/toml.sh +++ b/tests-ng/toml.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/transformations-template.sh b/tests-ng/transformations-template.sh index eb13306..b249af9 100755 --- a/tests-ng/transformations-template.sh +++ b/tests-ng/transformations-template.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/transformations-with-args.sh b/tests-ng/transformations-with-args.sh index 2647e28..b8cee89 100755 --- a/tests-ng/transformations-with-args.sh +++ b/tests-ng/transformations-with-args.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/transformations.sh b/tests-ng/transformations.sh index fcbb549..68a02cf 100755 --- a/tests-ng/transformations.sh +++ b/tests-ng/transformations.sh @@ -9,7 +9,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-ignore-missing.sh b/tests-ng/update-ignore-missing.sh index da104eb..d4c4e03 100755 --- a/tests-ng/update-ignore-missing.sh +++ b/tests-ng/update-ignore-missing.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-ignore-relative.sh b/tests-ng/update-ignore-relative.sh index 45d7552..56c56bb 100755 --- a/tests-ng/update-ignore-relative.sh +++ b/tests-ng/update-ignore-relative.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-ignore.sh b/tests-ng/update-ignore.sh index 42594b1..8852ea6 100755 --- a/tests-ng/update-ignore.sh +++ b/tests-ng/update-ignore.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-negative-ignore-relative.sh b/tests-ng/update-negative-ignore-relative.sh index 9709bca..cb9995a 100755 --- a/tests-ng/update-negative-ignore-relative.sh +++ b/tests-ng/update-negative-ignore-relative.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-negative-ignore.sh b/tests-ng/update-negative-ignore.sh index 1325564..a426943 100755 --- a/tests-ng/update-negative-ignore.sh +++ b/tests-ng/update-negative-ignore.sh @@ -7,7 +7,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-profile-check.sh b/tests-ng/update-profile-check.sh index 7827d67..7755b11 100755 --- a/tests-ng/update-profile-check.sh +++ b/tests-ng/update-profile-check.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-rights.sh b/tests-ng/update-rights.sh index 0fbf69a..c29210c 100755 --- a/tests-ng/update-rights.sh +++ b/tests-ng/update-rights.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-templates.sh b/tests-ng/update-templates.sh index e638569..ec7678f 100755 --- a/tests-ng/update-templates.sh +++ b/tests-ng/update-templates.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update-with-key.sh b/tests-ng/update-with-key.sh index c5d31e3..6b40942 100755 --- a/tests-ng/update-with-key.sh +++ b/tests-ng/update-with-key.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/update.sh b/tests-ng/update.sh index fde29a9..527b243 100755 --- a/tests-ng/update.sh +++ b/tests-ng/update.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh index 55b82ba..f6ab82e 100755 --- a/tests-ng/uservariables.sh +++ b/tests-ng/uservariables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/variables-enrich.sh b/tests-ng/variables-enrich.sh index 0b1722f..9a359e0 100755 --- a/tests-ng/variables-enrich.sh +++ b/tests-ng/variables-enrich.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/variables-include.sh b/tests-ng/variables-include.sh index 95423cd..a389143 100755 --- a/tests-ng/variables-include.sh +++ b/tests-ng/variables-include.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/variables.sh b/tests-ng/variables.sh index 7d982e5..92d1c77 100755 --- a/tests-ng/variables.sh +++ b/tests-ng/variables.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/workdir-compare.sh b/tests-ng/workdir-compare.sh index 84c6b05..4696f17 100755 --- a/tests-ng/workdir-compare.sh +++ b/tests-ng/workdir-compare.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests-ng/workdir.sh b/tests-ng/workdir.sh index 4c29224..be741ff 100755 --- a/tests-ng/workdir.sh +++ b/tests-ng/workdir.sh @@ -8,7 +8,7 @@ ## start-cookie set -e -cur=$(cd "$(dirname "${BASH_SOURCE:-$0}")" && pwd) +cur=$(cd "$(dirname "${0}")" && pwd) ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" diff --git a/tests.sh b/tests.sh index d01d542..c855d38 100755 --- a/tests.sh +++ b/tests.sh @@ -6,15 +6,7 @@ #set -ev set -e -rl="readlink -f" -if ! ${rl} "${0}" >/dev/null 2>&1; then - rl="realpath" - - if ! hash ${rl}; then - echo "\"${rl}\" not found!" && exit 1 - fi -fi -cur=$(dirname "$(${rl} "${0}")") +cur=$(cd "$(dirname "${0}")" && pwd) # make sure both version.py and manpage dotdrop.1 are in sync dotdrop_version=$(grep version dotdrop/version.py | sed 's/^.*= .\(.*\).$/\1/g')