diff --git a/README.md b/README.md index de47d4a..d6e6e4c 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ # GitHub Action ```yaml -- uses: pkgxdev/setup@v2 +- uses: pkgxdev/setup@v3 ``` 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@v2 +- uses: pkgxdev/setup@v3 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 6ff353d..f187b99 100755 --- a/installer.sh +++ b/installer.sh @@ -61,13 +61,13 @@ _install_pre_reqs() { case $(cat /etc/debian_version) in jessie/sid|8.*|stretch/sid|9.*) - apt --yes install libc-dev libstdc++-4.8-dev libgcc-4.7-dev $A $B;; + apt install --yes libc-dev libstdc++-4.8-dev libgcc-4.7-dev $A $B;; buster/sid|10.*) - apt --yes install libc-dev libstdc++-8-dev libgcc-8-dev $A $B;; + apt install --yes libc-dev libstdc++-8-dev libgcc-8-dev $A $B;; bullseye/sid|11.*) - apt --yes install libc-dev libstdc++-10-dev libgcc-9-dev $A $B;; + apt install --yes libc-dev libstdc++-10-dev libgcc-9-dev $A $B;; bookworm/sid|12.*|*) - apt --yes install libc-dev libstdc++-11-dev libgcc-11-dev $A $B;; + apt install --yes libc-dev libstdc++-11-dev libgcc-11-dev $A $B;; esac elif test -f /etc/fedora-release; then $SUDO yum --assumeyes install libatomic @@ -129,10 +129,11 @@ _install_pkgx() { } _pkgx_is_old() { - v="$(/usr/local/bin/pkgx --version || echo pkgx 0)" - /usr/local/bin/pkgx --silent semverator gt \ - $(curl -Ssf https://pkgx.sh/VERSION) \ - $(echo $v | awk '{print $2}') + new_version=$(curl -Ssf https://pkgx.sh/VERSION) + old_version="$((/usr/local/bin/pkgx --version || echo pkgx 0) | awk '{print $2}')" + major_version=$(echo $new_version | cut -d. -f1) + + /usr/local/bin/pkgx --silent semverator gt $new_version $old_version } _should_install_pkgx() { @@ -160,7 +161,7 @@ if [ $# -gt 0 ]; then elif [ $(basename "/$0") != 'installer.sh' ]; then # ^^ temporary exception for action.ts - if type eval >/dev/null 2>&1; then + if [ $major_version -lt 2 ] && type eval >/dev/null 2>&1; then # we `type eval` as on Travis there was no `eval`! eval "$(pkgx --shellcode)" 2>/dev/null fi