Index: build/utils/download-api-client ================================================================== --- build/utils/download-api-client +++ build/utils/download-api-client @@ -1,9 +1,19 @@ #! /usr/bin/env bash # Define endpoint endpoint_url="https://kitcreator.rkeene.org/kitcreator" + +# Help +function print_help() { + echo 'download-api-client [--platform ] [--tcl-version ]' + echo ' [--kitcreator-version ] [--kitdll]' + echo ' [--threaded] [--debug] [--dynamictk]' + echo ' [--staticpkgs]' + echo 'download-api-client {--help|--platforms|--tcl-versions|' + echo ' --kitcreator-versions|--packages}' +} # Set arguments declare -A jsonArgs jsonArgs["platform"]="$(uname -s)-$(uname -m)" @@ -20,13 +30,33 @@ case "${arg}" in --platform|--tcl-version|--kitcreator-version) nextArg="${arg:2}" nextArg="${nextArg//-/_}" ;; - --kitdll|--threaded) + --kitdll|--threaded|--debug|--dynamictk|--staticpkgs) options+=("${arg:2}") ;; + --platforms|--tcl-versions|--kitcreator-versions|--packages|--options) + action="${arg:2}" + action="${action//-/_}" + + formatString='%-20s | %s\n' + printf "${formatString}" Name Description + printf '%s+%s\n' --------------------- --------------------- + curl -sSL -d "json={\"action\":\"${action}\"}" "${endpoint_url}" | jq -crM 'keys[] as $k | "\($k) \(.[$k])"' | while read -r platform description; do + printf "${formatString}" "${platform}" "${description}" + done + exit 0 + ;; + --help) + print_help + exit 0 + ;; + *) + echo "Invalid option \"${arg}\"" >&2 + print_help >&2 + exit 1 esac done if [ -n "${options[*]}" ]; then jsonArgs["options"]="${options[@]}" @@ -74,17 +104,19 @@ sleep 30 echo -n '.' done status="$(jq -crM .status <<<"${info}")" +build_log_url="$(jq -crM .build_log_url <<<"${info}")" if [ -n "${buildStatusWroteHeader}" ]; then echo " ${status}" fi if [ "${status}" != "complete" ]; then echo "failed: ${status}" >&2 + curl -sSL "${build_log_url}" >&2 exit 1 fi kit_url="$(jq -crM .kit_url <<<"${info}")" Index: build/web/building.cgi ================================================================== --- build/web/building.cgi +++ build/web/building.cgi @@ -142,11 +142,11 @@ terminal $terminalBoolean \ ] if {[string tolower $status] eq "complete"} { dict set resultsDict kit_url $url } - if {[string tolower $status] in {complete building}} { + if {[string tolower $status] in {complete building failed}} { dict set resultsDict build_log_url $build_log_url catch { dict set resultsDict tcl_version $buildinfo(tcl_version) } catch {