Skip to content

Commit d49998b

Browse files
author
github-action
committed
new update of dtcw
1 parent b1155fa commit d49998b

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

dtcw

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -o pipefail
1212

1313
# See https://github.com/docToolchain/docToolchain/releases for available versions.
1414
# Set DTC_VERSION to "latest" to get the latest, yet unreleased version.
15-
: "${DTC_VERSION:=3.4.0}"
15+
: "${DTC_VERSION:=3.4.1}"
1616

1717
# if not set, public docker hub is used
1818
: "${DTC_DOCKER_PREFIX:=}"
@@ -129,7 +129,9 @@ main() {
129129
fi
130130

131131
# echo "Command to invoke: ${command}"
132-
exec ${emu} ${bash} -c "${command}"
132+
# shellcheck disable=SC2086
133+
# as we hope to know what we are doing here ;-)
134+
exec ${emu} ${bash} ${DTC_SHELL_DEBUG:-} -c "${command}"
133135
}
134136

135137
assert_argument_exists() {
@@ -642,12 +644,16 @@ build_command() {
642644
DTC_OPTS="${DTC_OPTS} '-Dgradle.user.home=${DTC_ROOT}/.gradle'"
643645
fi
644646
if [ "${env}" = local ]; then
647+
if [ -x "${DTC_HOME}/bin/doctoolchain" ]; then
648+
cmd="${DTC_HOME}/bin/doctoolchain"
645649
# is doctoolchain available on the path?
646-
if command -v doctoolchain >/dev/null 2>&1; then
647-
cmd="doctoolchain . ${*} ${DTC_OPTS}"
650+
elif command -v doctoolchain >/dev/null 2>&1; then
651+
cmd="doctoolchain"
648652
else
649-
cmd="${DTC_HOME}/bin/doctoolchain . ${*} ${DTC_OPTS}"
653+
echo "Could not find doctoolchain executable, neither in '${DTC_HOME}' nor on PATH ('${PATH}')" >&2
654+
exit 1
650655
fi
656+
cmd="${cmd} . ${*} ${DTC_OPTS}"
651657
else
652658
cmd="$(sdk_home_doctoolchain "${version}")/bin/doctoolchain . ${*} ${DTC_OPTS}"
653659
fi

dtcw.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ErrorActionPreference = "Stop"
1818

1919
# See https://github.com/docToolchain/docToolchain/releases for available versions.
2020
# Set DTC_VERSION to "latest" to get the latest, yet unreleased version.
21-
$DTC_VERSION = "3.4.0"
21+
$DTC_VERSION = "3.4.1"
2222
if ($env:DTC_VERSION) { $DTC_VERSION = $env:DTC_VERSION }
2323

2424
#here you can specify the URL of a theme to use with generateSite-task

dtcw.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $ErrorActionPreference = "Stop"
99

1010
# See https://github.com/docToolchain/docToolchain/releases for available versions.
1111
# Set DTC_VERSION to "latest" to get the latest, yet unreleased version.
12-
$DTC_VERSION = "3.4.0"
12+
$DTC_VERSION = "3.4.1"
1313
if ($env:DTC_VERSION) { $DTC_VERSION = $env:DTC_VERSION }
1414

1515
#here you can specify the URL of a theme to use with generateSite-task

0 commit comments

Comments
 (0)