Merge branch 'main' into main

pnpm · Dec 15, 2023 · 706ab7b · 706ab7b
2 parents e989de6 + c7e51d1
commit 706ab7b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/SHASUMS256.txt b/SHASUMS256.txt
@@ -4,5 +4,5 @@ d6e6538b8fa1147a58efac1ed2bf7f3311aecd5d8e1b11c0070794a5c5b151d8  v6.6.js
 c80817f1dac65ee497fc8ca0b533e497aacfbf951a917ff4652825710bbacda7  v6.14.js
 675896fe510fe86a6c4812c46334aafe789a05dd60652cca768b78971ca2b906  v6.16.js
 be155eed896aa8c7900352c2b28640bcbace13171ec632b0e29f0ac94e5b27d1  v6.32.js
-df09f85bfcdffe6c2a1bd0966bdd65404859b72b64e941244e65dcd2d9148485  install.sh
+5b451a2e1899cf48b1363425e759ce986920be0b173b363ed4fa135a06756641  install.sh
 7881ea9b132eb7c6d12db6f14ca55bbb5d251edf08693d570eac31ad0d00c827  install.ps1
diff --git a/SHASUMS256.txt.sig b/SHASUMS256.txt.sig
diff --git a/_update.sh b/_update.sh
@@ -1,14 +1,14 @@
 set -e
-rm SHASUMS256.txt SHASUMS256.txt.sig
+rm -f SHASUMS256.txt SHASUMS256.txt.sig
 {
-  sha256sum v6.js;
-  sha256sum v6.6.js;
-  sha256sum v6.7.js;
-  sha256sum v6.14.js;
-  sha256sum v6.16.js;
-  sha256sum v6.32.js;
-  sha256sum install.sh;
-  sha256sum install.ps1;
+  shasum -a 256 v6.js;
+  shasum -a 256 v6.6.js;
+  shasum -a 256 v6.7.js;
+  shasum -a 256 v6.14.js;
+  shasum -a 256 v6.16.js;
+  shasum -a 256 v6.32.js;
+  shasum -a 256 install.sh;
+  shasum -a 256 install.ps1;
 } >> SHASUMS256.txt
 gpg --local-user pnpm --detach-sign SHASUMS256.txt
 
diff --git a/install.sh b/install.sh
@@ -84,8 +84,8 @@ download_and_install() {
   platform="$(detect_platform)"
   arch="$(detect_arch)" || abort "Sorry! pnpm currently only provides pre-built binaries for x86_64/arm64 architectures."
   if [ -z "${PNPM_VERSION}" ]; then
-    version_json="$(download "https://registry.npmjs.org/@pnpm/exe")" || abort "Download Error!"
-    version="$(printf '%s' "${version_json}" | tr '{' '\n' | awk -F '"' '/latest/ { print $4 }')"
+    version_json="$(download "https://api.github.com/repos/pnpm/pnpm/releases")" || abort "Download Error!"
+    version="$(printf '%s' "${version_json}" | grep '"tag_name"' | head -n 1 | awk -F '"' '/tag_name/ { print substr($4,2) }')"
   else
     version="${PNPM_VERSION}"
   fi