From: Daniele Varrazzo Date: Mon, 25 Sep 2023 15:16:02 +0000 (+0200) Subject: ci(scaleway_m1): add list command and jq pretty output X-Git-Tag: 3.1.12~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=125f93c852cf9a0c4158fe45f162b3b420568a8e;p=thirdparty%2Fpsycopg.git ci(scaleway_m1): add list command and jq pretty output --- diff --git a/tools/build/scaleway_m1.sh b/tools/build/scaleway_m1.sh index a80374681..cc0fa6ef1 100755 --- a/tools/build/scaleway_m1.sh +++ b/tools/build/scaleway_m1.sh @@ -75,13 +75,23 @@ function server_id { done } -cmd=${1:-} +function maybe_jq { + # Process the output via jq if displaying on console, otherwise leave + # it unprocessed. + if [ -t 1 ]; then + jq . + else + cat + fi +} + +cmd=${1:-list} case $cmd in ensure) id=$(server_id) if [[ "$id" ]]; then log "You have servers." - get "$servers_url/$id" + get "$servers_url/$id" | maybe_jq else log "Creating new server." post $servers_url -d " @@ -89,18 +99,21 @@ case $cmd in \"name\": \"mac-m1-psycopg\", \"project_id\": \"$project_id\", \"type\": \"M1-M\" - }" + }" | maybe_jq fi ;; delete) id=$(server_id) if [[ "$id" ]]; then log "Deleting server $id." - delete "$servers_url/$id" + delete "$servers_url/$id" | maybe_jq else log "No server found." fi ;; + list) + get $servers_url | maybe_jq + ;; *) - error "Usage: $0 {ensure|delete}" + error "Usage: $(basename $0) [list|ensure|delete]" esac