Merge pull request #19 from pkgxdev/quiet

Use `pkgx --quiet` where sensible

Author: mxcl

mash

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env -S pkgx --quiet bash
 
 set -eo pipefail
 
@@ -17,7 +17,7 @@ if ! command -v pkgx >/dev/null; then
 fi
 if ! command -v curl >/dev/null; then
   curl() {
-    pkgx curl "$@"
+    pkgx --quiet curl "$@"
   }
 fi
 
@@ -70,7 +70,7 @@ run() {
 }
 
 if [ -z "$1" ]; then
-  curl -Ssf https://pkgxdev.github.io/mash/ | pkgx jq '.categories[]' --raw-output | sort | uniq
+  curl -Ssf https://pkgxdev.github.io/mash/ | pkgx --quiet jq '.categories[]' --raw-output | sort | uniq
   exit 0
 elif [[ "$1" == *"/"* ]]; then
   # fully quaified name not a category
@@ -79,9 +79,9 @@ elif [[ "$1" == *"/"* ]]; then
   run u/$cmd "$@"
 elif [[ -z "$2" ]]; then
   curl -Ssf https://pkgxdev.github.io/mash/$1/ |
-    pkgx jq -r '.scripts[] | [.cmd, .description] | @tsv' |
+    pkgx --quiet jq -r '.scripts[] | [.cmd, .description] | @tsv' |
     awk 'BEGIN {FS="\t"; print "| Script | Description |"; print "|-|-|"} {printf("| %s | %s |\n", $1, $2)}' |
-    pkgx gum format
+    pkgx --quiet gum format
 else
   cmd=$1/$2
   shift; shift

scripts/cache

@@ -9,9 +9,9 @@ shift
 
 case "$cmd" in
 neophile|neophilia|neophiliac)
-  exec pkgx mash "pkgx/upgrade" "$@";;
+  exec pkgx --quiet mash "pkgx/upgrade" "$@";;
 ls|upgrade|prune)
-  exec pkgx mash "pkgx/$cmd" "$@";;
+  exec pkgx --quiet mash "pkgx/$cmd" "$@";;
 --help)
   usage;;
 *)

scripts/demo-test-pattern

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx bash
+#!/usr/bin/env -S pkgx --quiet bash
 printf "          "
 for b in 0 1 2 3 4 5 6 7; do printf "  4${b}m "; done
 echo

scripts/ls.rb

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-pkgx mash pkgx/ensure ruby "$0" | pkgx gum format
+pkgx --quiet mash pkgx/ensure ruby "$0" | pkgx --quiet gum format
 exit 0
 
 #!/usr/bin/ruby

scripts/magic.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
 handler=$(cat <<EoHndlr
-      if [ -t 2 ] && [ \$1 != pkgx ] && pkgx pkgx^1 --silent --provider \$1; then
-        if pkgx gum confirm "^^ run that with \\\`pkgx\\\`?"; then
+      if [ -t 2 ] && [ \$1 != pkgx ] && pkgx --quiet pkgx^1 --silent --provider \$1; then
+        if pkgx --quiet gum confirm "^^ run that with \\\`pkgx\\\`?"; then
           pkgx "\$@"
         else
           return 127

scripts/pantry-inventory.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx deno^1.40 run --ext=ts --allow-net=dist.pkgx.dev --allow-read --allow-env --allow-ffi --unstable-ffi
+#!/usr/bin/env -S pkgx --quiet deno^1.40 run --ext=ts --allow-net=dist.pkgx.dev --allow-read --allow-env --allow-ffi --unstable-ffi
 
 import { hooks, semver } from "https://deno.land/x/[email protected]/mod.ts"
 const { usePantry, useInventory } = hooks

scripts/prune.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx deno~1.39 run --unstable -A --ext=ts
+#!/usr/bin/env -S pkgx --quiet deno~1.39 run --unstable -A --ext=ts
 
 import { hooks, semver, SemVer, utils, plumbing, Installation } from "https://deno.land/x/[email protected]/mod.ts"
 import { Command } from "https://deno.land/x/[email protected]/command/mod.ts"

scripts/run

@@ -1,6 +1,6 @@
-#!/usr/bin/env -S pkgx +deno bash -eo pipefail
+#!/usr/bin/env -S pkgx --quiet +deno bash -eo pipefail
 
-eval "$(pkgx --shellcode)"
+eval "$(pkgx --quiet --shellcode)"
 
 get_parameters() {
   deno run --allow-read --allow-env - <<EoTS

scripts/stub.sh

@@ -7,14 +7,20 @@ if [ "$#" -gt 1 ]; then
     exit 1
 fi
 
-pkgx +$1 >/dev/null
+pkgx --quiet +$1 >/dev/null
+major_version=$(pkgx --version | cut -d' ' -f2 | cut -d. -f1)
+minor_version=$(pkgx --version | cut -d' ' -f2 | cut -d. -f2)
 
 f=$(mktemp)
 
-cat <<EoSH > "$f"
-#!/bin/sh
-exec pkgx $1 "\$@"
-EoSH
+if ! [ "$major_version" -ge 2 -a "$minor_version" -ge 4 ]; then
+    echo '#!/bin/sh' > "$f"
+    echo "exec pkgx --quiet $1 \"\$@\"" >> "$f"
+elif [ $(uname) = Darwin -a "$(command -v pkgx)" = "/usr/local/bin/pkgx" ]; then
+    echo "#!/usr/local/bin/pkgx -q! $1" > "$f"
+else
+    echo "#!/usr/bin/env -S pkgx -q! $1" > "$f"
+fi
 
 sudo install -m 0755 "$f" /usr/local/bin/$1
 

scripts/upgrade.ts

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx deno~1.39 run --ext=ts --allow-read --unstable --allow-net --allow-ffi --allow-write --allow-env --allow-run
+#!/usr/bin/env -S pkgx --quiet deno~1.39 run --ext=ts --allow-read --unstable --allow-net --allow-ffi --allow-write --allow-env --allow-run
 
 import { hooks, Path, plumbing, semver, SemVer } from "https://deno.land/x/[email protected]/mod.ts"
 import { walk } from "https://deno.land/[email protected]/fs/mod.ts"