Skip to content

Commit

Permalink
new update of dtcw
Browse files Browse the repository at this point in the history
  • Loading branch information
github-action committed Sep 12, 2024
1 parent b1155fa commit d49998b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
16 changes: 11 additions & 5 deletions dtcw
Original file line number Diff line number Diff line change
Expand Up @@ -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:=}"
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dtcw.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dtcw.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d49998b

Please sign in to comment.