mirror of
https://github.com/taiki-e/install-action.git
synced 2026-04-21 15:10:27 +00:00
Fix jq handling on Windows
Fix regression introduced in unreleased 400052b460.
This commit is contained in:
28
main.sh
28
main.sh
@@ -604,7 +604,9 @@ case "${host_os}" in
|
|||||||
if ! type -P curl >/dev/null; then
|
if ! type -P curl >/dev/null; then
|
||||||
warn "install-action requires at least curl on Windows"
|
warn "install-action requires at least curl on Windows"
|
||||||
fi
|
fi
|
||||||
if type -P jq >/dev/null; then
|
if [[ -f "${install_action_dir}/jq/bin/jq.exe" ]]; then
|
||||||
|
jq() { "${install_action_dir}/jq/bin/jq.exe" -b "$@"; }
|
||||||
|
elif type -P jq >/dev/null; then
|
||||||
# https://github.com/jqlang/jq/issues/1854
|
# https://github.com/jqlang/jq/issues/1854
|
||||||
_tmp=$(jq -r .a <<<'{}')
|
_tmp=$(jq -r .a <<<'{}')
|
||||||
if [[ "${_tmp}" != "null" ]]; then
|
if [[ "${_tmp}" != "null" ]]; then
|
||||||
@@ -614,19 +616,19 @@ case "${host_os}" in
|
|||||||
else
|
else
|
||||||
jq() { command jq "$@" | tr -d '\r'; }
|
jq() { command jq "$@" | tr -d '\r'; }
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
printf '::group::Install packages required for installation (jq)\n'
|
|
||||||
mkdir -p -- "${install_action_dir}/jq/bin"
|
|
||||||
url='https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-amd64.exe'
|
|
||||||
checksum='7451fbbf37feffb9bf262bd97c54f0da558c63f0748e64152dd87b0a07b6d6ab'
|
|
||||||
(
|
|
||||||
cd -- "${install_action_dir}/jq/bin"
|
|
||||||
download_and_checksum "${url}" "${checksum}"
|
|
||||||
mv -- tmp jq.exe
|
|
||||||
)
|
|
||||||
printf '::endgroup::\n'
|
|
||||||
jq() { "${install_action_dir}/jq/bin/jq.exe" -b "$@"; }
|
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
printf '::group::Install packages required for installation (jq)\n'
|
||||||
|
mkdir -p -- "${install_action_dir}/jq/bin"
|
||||||
|
url='https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-amd64.exe'
|
||||||
|
checksum='7451fbbf37feffb9bf262bd97c54f0da558c63f0748e64152dd87b0a07b6d6ab'
|
||||||
|
(
|
||||||
|
cd -- "${install_action_dir}/jq/bin"
|
||||||
|
download_and_checksum "${url}" "${checksum}"
|
||||||
|
mv -- tmp jq.exe
|
||||||
|
)
|
||||||
|
printf '::endgroup::\n'
|
||||||
|
jq() { "${install_action_dir}/jq/bin/jq.exe" -b "$@"; }
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*) bail "unsupported host OS '${host_os}'" ;;
|
*) bail "unsupported host OS '${host_os}'" ;;
|
||||||
|
|||||||
Reference in New Issue
Block a user