From d703046dbbb7f942b6b76941198c4c6bc21428b5 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Tue, 14 Jan 2025 13:32:56 -0500 Subject: [PATCH] Fix spurious messages --- README.md | 4 ++-- installer.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f5347a9a..de47d4a5 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ # GitHub Action ```yaml -- uses: pkgxdev/setup@v1 +- uses: pkgxdev/setup@v2 ``` Installs the latest version of `pkgx`. @@ -15,7 +15,7 @@ Installs the latest version of `pkgx`. See [`action.yml`] for all inputs and outputs, but here’s the usual ones: ```yaml -- uses: pkgxdev/setup@v1 +- uses: pkgxdev/setup@v2 with: +: deno@1.30 rust@1.60 # we understand colloquial names, generally just type what you know diff --git a/installer.sh b/installer.sh index bc6686f3..6ff353de 100755 --- a/installer.sh +++ b/installer.sh @@ -29,11 +29,10 @@ _install_pre_reqs() { $SUDO apt-get $cmd -qq -o=Dpkg::Use-Pty=0 $@ } else - echo "ensure you have the `pkgx` pre-requisites installed:" >&2 apt() { case "$1" in update) - echo >&2 + echo "ensure you have the `pkgx` pre-requisites installed:" >&2 ;; install) echo " apt-get" "$@" >&2 @@ -41,9 +40,11 @@ _install_pre_reqs() { esac } yum() { + echo "ensure you have the `pkgx` pre-requisites installed:" >&2 echo " yum" "$@" >&2 } pacman() { + echo "ensure you have the `pkgx` pre-requisites installed:" >&2 echo " pacman" "$@" >&2 } fi @@ -107,7 +108,7 @@ _install_pkgx() { rm -r "$tmpdir" - if [ "$(command -v pkgx)" != /usr/local/bin/pkgx ]; then + if [ "$(command -v pkgx 2>&1)" != /usr/local/bin/pkgx ]; then echo "warning: active pkgx is not /usr/local/bin/pkgx" >&2 export PATH="/usr/local/bin:$PATH" # so we can exec if required fi