Add support for macOS and arm arch (#21)

* do not hide jq errors
TheoBrigitte · Dec 3, 2024 · 7809dfe · 7809dfe
1 parent fef23a9
commit 7809dfe
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/bin/check.sh b/bin/check.sh
@@ -75,7 +75,7 @@ notify_discord() {
     echo_stderr "$RESULT"
   fi
 
-  if echo "$RESULT" | $JQ_BIN -e .message &>/dev/null; then
+  if echo "$RESULT" | $JQ_BIN -e .message 1>/dev/null; then
     echo_stderr "$RESULT"
     echo_stderr "> failed Discord notification"
   else
@@ -107,7 +107,7 @@ notify_gotify() {
     echo_stderr "$RESULT"
   fi
 
-  if echo "$RESULT" | $JQ_BIN -e .error &>/dev/null; then
+  if echo "$RESULT" | $JQ_BIN -e .error 1>/dev/null; then
     echo_stderr "$RESULT"
     echo_stderr "> failed Gotify notification"
   else
@@ -131,7 +131,7 @@ notify_opsgenie() {
     echo_stderr "$RESULT"
   fi
 
-  if echo "$RESULT" | $JQ_BIN -e '.result | length > 0' &>/dev/null; then
+  if echo "$RESULT" | $JQ_BIN -e '.result | length > 0' 1>/dev/null; then
     echo "> sent    OpsGenie notification"
   else
     echo_stderr "$RESULT"
@@ -158,7 +158,7 @@ notify_telegram() {
     echo_stderr "$RESULT"
   fi
 
-  if echo "$RESULT" | $JQ_BIN -e .ok &>/dev/null; then
+  if echo "$RESULT" | $JQ_BIN -e .ok 1>/dev/null; then
     echo "> sent    Telegram notification"
   else
     echo_stderr "$RESULT"
@@ -185,7 +185,7 @@ get_catalog() {
   ovh_url="${OVH_API_ENDPOINTS["$ENDPOINT"]}/order/catalog/public/eco?ovhSubsidiary=${country}"
   data=$(curl -qSs "${ovh_url}")
 
-  if test -z "$data" || ! echo "$data" | $JQ_BIN -e . &>/dev/null || echo "$data" | $JQ_BIN -e '.plans | length == 0' &>/dev/null; then
+  if test -z "$data" || ! echo "$data" | $JQ_BIN -e . 1>/dev/null || echo "$data" | $JQ_BIN -e '.plans | length == 0' 1>/dev/null; then
     echo_stderr "> failed to fetch data from $ovh_url"
     exit 2
   fi
@@ -404,7 +404,7 @@ main() {
   fi
 
   # Check for error: empty data, invalid json, or empty list
-  if test -z "$DATA" || ! echo "$DATA" | $JQ_BIN -e . &>/dev/null || echo "$DATA" | $JQ_BIN -e '. | length == 0' &>/dev/null; then
+  if test -z "$DATA" || ! echo "$DATA" | $JQ_BIN -e . 1>/dev/null || echo "$DATA" | $JQ_BIN -e '. | length == 0' 1>/dev/null; then
     echo_stderr "> failed to fetch data from $endpoint"
     exit 2
   fi
@@ -415,7 +415,7 @@ main() {
   fi
 
   # Check for datacenters availability
-  if ! echo "$DATA" | $JQ_BIN -e '.[].datacenters[] | select(.availability != "unavailable")' &>/dev/null; then
+  if ! echo "$DATA" | $JQ_BIN -e '.[].datacenters[] | select(.availability != "unavailable")' 1>/dev/null; then
     echo "> checked  $PLAN_CODE unavailable  in $DATACENTERS_MESSAGE"
     exit 4
   fi

diff --git a/bin/common.sh b/bin/common.sh
@@ -29,5 +29,20 @@ install_tool() {
 }
 
 install_tools() {
-  install_tool "${JQ_BIN}" "${JQ_VERSION}" "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64"
+  os=""
+  case "$OSTYPE" in
+    darwin*)  os="macos" ;;
+    linux*)   os="linux" ;;
+    *)        echo "unsupported OS: $OSTYPE"; exit ;;
+  esac
+
+  arch=""
+  case "$(uname -m)" in
+    x86_64) arch="amd64" ;;
+    arm*)   arch="arm64" ;;
+    aarch*) arch="arm64" ;;
+    *)     echo "unsupported architecture: $(uname -m)"; exit ;;
+  esac
+
+  install_tool "${JQ_BIN}" "${JQ_VERSION}" "https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-${os}-${arch}"
 }
diff --git a/bin/list.sh b/bin/list.sh
@@ -110,7 +110,7 @@ main() {
   fi
 
   # Check for error: empty data, invalid json, or empty list
-  if test -z "$DATA" || ! echo "$DATA" | $JQ_BIN -e . &>/dev/null || echo "$DATA" | $JQ_BIN -e '.plans | length == 0' &>/dev/null; then
+  if test -z "$DATA" || ! echo "$DATA" | $JQ_BIN -e . 1>/dev/null || echo "$DATA" | $JQ_BIN -e '.plans | length == 0' 1>/dev/null; then
     echo_stderr "> failed to fetch data from $OVH_URL"
     exit 2
   fi