drop readlink req

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

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`:

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

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)

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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}/../"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"