CLI: cross-platform compatiblity

Author: hsk81

README.md

@@ -132,7 +132,7 @@ $ avalanche-cli keystore delete-user -Y
 Since `avalance-cli` does not process the JSON reponses, it is recommended to use the excellent [`jq`] tool to handle them. For example:
 
 ```sh
-$ avalanche-cli info peers -Y | jq .result.peers[0]
+$ avalanche-cli info peers -YS | jq .result.peers[0]
 ```
 ```json
 {
@@ -144,6 +144,7 @@ $ avalanche-cli info peers -Y | jq .result.peers[0]
   "lastReceived": "2020-06-27T04:16:38+02:00"
 }
 ```
+..where the `-S` (`--silent-rpc`) option tells the internal `curl` tool to not produce unnessary output, so we get the desired result from above. ;D
 
 ## [Admin API](https://docs.ava.network/v1.0/en/api/admin)
 

avalanche-cli.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC1090,SC1091,SC2214,SC2231
 ###############################################################################
-CLI_SCRIPT=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
-CLI_SCRIPT=$(cd "$CLI_SCRIPT" >/dev/null 2>&1 && pwd)
+CLI=$(dirname "${BASH_SOURCE[0]}")/$(dirname "$(readlink "${BASH_SOURCE[0]}")")
+CLI=$(cd "$CLI" >/dev/null 2>&1 && pwd)
 ###############################################################################
 
 function cli {
@@ -29,9 +29,9 @@ function cli {
 
 function cli_run {
     local cmd="$1" ;
-    local cmd_path="$CLI_SCRIPT/cmd/$cmd" ;
+    local cmd_path="$CLI/cmd/$cmd" ;
     local sub="$2" ;
-    local sub_path="$CLI_SCRIPT/cmd/$cmd/$sub.sh" ;
+    local sub_path="$CLI/cmd/$cmd/$sub.sh" ;
     if [ -d "$cmd_path" ] ; then
         if [ -f "$sub_path" ] ; then
             exec "$sub_path" "${@:3}" ;
@@ -63,7 +63,7 @@ function cli_supoptions {
 }
 
 function cli_supcommands {
-    for path in $CLI_SCRIPT/cmd/* ; do
+    for path in $CLI/cmd/* ; do
         path="${path##*/}" ;
         printf '%s ' "$path" ;
     done
@@ -75,7 +75,7 @@ function cli_suboptions {
 }
 
 function cli_subcommands {
-    for path in $CLI_SCRIPT/cmd/"$1"/*.sh ; do
+    for path in $CLI/cmd/"$1"/*.sh ; do
         if [[ ! "$path" =~ \.test\.sh$ ]] ; then
             path="${path##*/}" ;
             path="${path%.*}" ;
@@ -86,13 +86,13 @@ function cli_subcommands {
 }
 
 function cli_usage {
-    source "$CLI_SCRIPT/cli/help.sh" && \
+    source "$CLI/cli/help.sh" && \
         printf '%s\n' "$(cli_help "$1" "$2")" ;
 }
 
 function cli_version {
-    source "$CLI_SCRIPT/cli/jq.sh" && \
-        jq ".version" < "$CLI_SCRIPT/package.json" ;
+    source "$CLI/cli/jq.sh" && \
+        jq ".version" < "$CLI/package.json" ;
 }
 
 ###############################################################################

cli/rpc/post.sh

@@ -20,12 +20,12 @@ function rpc_post {
     else
         if [ -n "$(command -v jq)" ] ; then
             if [ "$mime" == "content-type:application/json" ] ; then
-                eval curl "${args}" --no-progress-meter | jq -c ;
+                eval curl "${args}" | jq -c ;
             else
-                eval curl "${args}" --no-progress-meter ;
+                eval curl "${args}" ;
             fi
         else
-            eval curl "${args}" --no-progress-meter ;
+            eval curl "${args}" ;
         fi
     fi
 }