diff --git a/dtcw b/dtcw index b742068..5587b20 100755 --- a/dtcw +++ b/dtcw @@ -12,7 +12,7 @@ set -o pipefail # See https://github.com/docToolchain/docToolchain/releases for available versions. # Set DTC_VERSION to "latest" to get the latest, yet unreleased version. -: "${DTC_VERSION:=3.4.0}" +: "${DTC_VERSION:=3.4.1}" # if not set, public docker hub is used : "${DTC_DOCKER_PREFIX:=}" @@ -129,7 +129,9 @@ main() { fi # echo "Command to invoke: ${command}" - exec ${emu} ${bash} -c "${command}" + # shellcheck disable=SC2086 + # as we hope to know what we are doing here ;-) + exec ${emu} ${bash} ${DTC_SHELL_DEBUG:-} -c "${command}" } assert_argument_exists() { @@ -642,12 +644,16 @@ build_command() { DTC_OPTS="${DTC_OPTS} '-Dgradle.user.home=${DTC_ROOT}/.gradle'" fi if [ "${env}" = local ]; then + if [ -x "${DTC_HOME}/bin/doctoolchain" ]; then + cmd="${DTC_HOME}/bin/doctoolchain" # is doctoolchain available on the path? - if command -v doctoolchain >/dev/null 2>&1; then - cmd="doctoolchain . ${*} ${DTC_OPTS}" + elif command -v doctoolchain >/dev/null 2>&1; then + cmd="doctoolchain" else - cmd="${DTC_HOME}/bin/doctoolchain . ${*} ${DTC_OPTS}" + echo "Could not find doctoolchain executable, neither in '${DTC_HOME}' nor on PATH ('${PATH}')" >&2 + exit 1 fi + cmd="${cmd} . ${*} ${DTC_OPTS}" else cmd="$(sdk_home_doctoolchain "${version}")/bin/doctoolchain . ${*} ${DTC_OPTS}" fi diff --git a/dtcw.bat b/dtcw.bat index bda2253..7e7e0bb 100644 --- a/dtcw.bat +++ b/dtcw.bat @@ -18,7 +18,7 @@ $ErrorActionPreference = "Stop" # See https://github.com/docToolchain/docToolchain/releases for available versions. # Set DTC_VERSION to "latest" to get the latest, yet unreleased version. -$DTC_VERSION = "3.4.0" +$DTC_VERSION = "3.4.1" if ($env:DTC_VERSION) { $DTC_VERSION = $env:DTC_VERSION } #here you can specify the URL of a theme to use with generateSite-task diff --git a/dtcw.ps1 b/dtcw.ps1 index 8354571..0360453 100644 --- a/dtcw.ps1 +++ b/dtcw.ps1 @@ -9,7 +9,7 @@ $ErrorActionPreference = "Stop" # See https://github.com/docToolchain/docToolchain/releases for available versions. # Set DTC_VERSION to "latest" to get the latest, yet unreleased version. -$DTC_VERSION = "3.4.0" +$DTC_VERSION = "3.4.1" if ($env:DTC_VERSION) { $DTC_VERSION = $env:DTC_VERSION } #here you can specify the URL of a theme to use with generateSite-task