Merge remote-tracking branch 'upstream/master'

Author: googleworkspace-bot

.changeset/brave-timers-move.md

@@ -0,0 +1,5 @@
+---
+"fnm": patch
+---
+
+support `x64-glibc-217` arch by adding a `--arch x64-glibc-217` to fnm env

.changeset/cuddly-cars-ring.md

@@ -0,0 +1,5 @@
+---
+"fnm": patch
+---
+
+prefer explicit shell flags in installer-generated shell setup and fix ARM installer CI platform selection

.changeset/fair-carrots-greet.md

@@ -0,0 +1,5 @@
+---
+"fnm": patch
+---
+
+Clarify the interactive `fnm use` missing-version prompt by prefixing the message with `fnm` so it is obvious which tool is asking to install Node.

.ci/install.sh

@@ -1,13 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 RELEASE="latest"
 OS="$(uname -s)"
-USE_HOMEBREW=""
-FORCE_INSTALL=""
-SHOULD_EXIT=""
-SKIP_SHELL=""
 
 case "${OS}" in
    MINGW* | Win*) OS="Windows" ;;
@@ -25,7 +21,7 @@ fi
 
 # Parse Flags
 parse_args() {
-  while [ "$#" -gt 0 ]; do
+  while [[ $# -gt 0 ]]; do
     key="$1"
 
     case $key in
@@ -88,40 +84,6 @@ set_filename() {
   fi
 }
 
-# Portable temp dir creator (uses mktemp if available, with a fallback)
-mktempdir() {
-  # Prefer mktemp if available; try common variants
-  if command -v mktemp >/dev/null 2>&1; then
-    if tmp=$(mktemp -d "${TMPDIR:-/tmp}/fnm.XXXXXXXX" 2>/dev/null); then
-      printf '%s\n' "$tmp"
-      return 0
-    fi
-    if tmp=$(TMPDIR="${TMPDIR:-/tmp}" mktemp -d -t fnm 2>/dev/null); then
-      printf '%s\n' "$tmp"
-      return 0
-    fi
-    if tmp=$(mktemp -d 2>/dev/null); then
-      printf '%s\n' "$tmp"
-      return 0
-    fi
-  fi
-
-  # Fallback: predictable, but private-perms directory creation loop
-  base="${TMPDIR:-/tmp}/fnm.$$"
-  i=0
-  while [ "$i" -lt 1000 ]; do
-    dir="${base}.${i}"
-    if (umask 077; mkdir "$dir" 2>/dev/null); then
-      printf '%s\n' "$dir"
-      return 0
-    fi
-    i=$((i + 1))
-  done
-
-  printf '%s\n' "mktempdir: could not create a temp directory under ${TMPDIR:-/tmp}" >&2
-  return 1
-}
-
 download_fnm() {
   if [ "$USE_HOMEBREW" = "true" ]; then
     brew install fnm
@@ -133,15 +95,12 @@ download_fnm() {
       URL="https://github.com/Schniz/fnm/releases/download/$RELEASE/$FILENAME.zip"
     fi
 
-    DOWNLOAD_DIR=$(mktempdir) || { echo "Unable to create a temporary directory under ${TMPDIR:-/tmp}."; exit 1; }
-    trap "rm -rf '$DOWNLOAD_DIR'" EXIT INT HUP TERM
-
-    echo "Installing fnm to $INSTALL_DIR"
-
-    mkdir -p "$INSTALL_DIR" >/dev/null 2>&1
+    DOWNLOAD_DIR=$(mktemp -d)
 
     echo "Downloading $URL..."
 
+    mkdir -p "$INSTALL_DIR" &>/dev/null
+
     if ! curl --progress-bar --fail -L "$URL" -o "$DOWNLOAD_DIR/$FILENAME.zip"; then
       echo "Download failed.  Check that the release/filename are correct."
       exit 1
@@ -162,25 +121,25 @@ download_fnm() {
 check_dependencies() {
   echo "Checking dependencies for the installation script..."
 
-  printf "Checking availability of curl... "
-  if command -v curl >/dev/null 2>&1; then
+  echo -n "Checking availability of curl... "
+  if hash curl 2>/dev/null; then
     echo "OK!"
   else
     echo "Missing!"
     SHOULD_EXIT="true"
   fi
 
-  printf "Checking availability of unzip... "
-  if command -v unzip >/dev/null 2>&1; then
+  echo -n "Checking availability of unzip... "
+  if hash unzip 2>/dev/null; then
     echo "OK!"
   else
     echo "Missing!"
     SHOULD_EXIT="true"
   fi
 
   if [ "$USE_HOMEBREW" = "true" ]; then
-    printf "Checking availability of Homebrew (brew)... "
-    if command -v brew >/dev/null 2>&1; then
+    echo -n "Checking availability of Homebrew (brew)... "
+    if hash brew 2>/dev/null; then
       echo "OK!"
     else
       echo "Missing!"
@@ -195,10 +154,11 @@ check_dependencies() {
 }
 
 ensure_containing_dir_exists() {
-  containing_dir="$(dirname "$1")"
-  if [ ! -d "$containing_dir" ]; then
-    echo " >> Creating directory $containing_dir"
-    mkdir -p "$containing_dir"
+  local CONTAINING_DIR
+  CONTAINING_DIR="$(dirname "$1")"
+  if [ ! -d "$CONTAINING_DIR" ]; then
+    echo " >> Creating directory $CONTAINING_DIR"
+    mkdir -p "$CONTAINING_DIR"
   fi
 }
 
@@ -217,7 +177,7 @@ setup_shell() {
       if [ "$USE_HOMEBREW" != "true" ]; then
         echo '  export PATH="$FNM_PATH:$PATH"'
       fi
-      echo '  eval "$(fnm env)"'
+      echo '  eval "$(fnm env --shell zsh)"'
       echo 'fi'
     } | tee -a "$CONF_FILE"
 
@@ -233,7 +193,7 @@ setup_shell() {
       if [ "$USE_HOMEBREW" != "true" ]; then
         echo '  set PATH "$FNM_PATH" $PATH'
       fi
-      echo '  fnm env | source'
+      echo '  fnm env --shell fish | source'
       echo 'end'
     } | tee -a "$CONF_FILE"
 
@@ -253,7 +213,7 @@ setup_shell() {
       if [ "$USE_HOMEBREW" != "true" ]; then
         echo '  export PATH="$FNM_PATH:$PATH"'
       fi
-      echo '  eval "$(fnm env)"'
+      echo '  eval "$(fnm env --shell bash)"'
       echo 'fi'
     } | tee -a "$CONF_FILE"
 
@@ -265,11 +225,7 @@ setup_shell() {
   echo ""
   echo "In order to apply the changes, open a new terminal or run the following command:"
   echo ""
-  if [ "$CURRENT_SHELL" = "fish" ]; then
-    echo "  source $CONF_FILE"
-  else
-    echo "  . $CONF_FILE"
-  fi
+  echo "  source $CONF_FILE"
 }
 
 parse_args "$@"

.github/workflows/installation_script.yml

@@ -1,5 +1,5 @@
 name: Installation script
-on: 
+on:
   pull_request:
     paths:
       - .ci/install.sh
@@ -13,9 +13,11 @@ jobs:
   test_against_latest_release_arm:
     strategy:
       matrix:
-        docker_image:
-          - arm64v8/ubuntu
-          - arm32v7/ubuntu
+        include:
+          - docker_image: arm64v8/ubuntu
+            docker_platform: linux/arm64/v8
+          - docker_image: arm32v7/ubuntu
+            docker_platform: linux/arm/v7
     name: Test against latest release (ARM)
     runs-on: ubuntu-latest
     steps:
@@ -25,7 +27,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run installation script in Docker
         run: |
-          docker run --rm -v $(pwd):$(pwd) -e "RUST_LOG=fnm=debug" --workdir $(pwd) ${{matrix.docker_image}} bash -c '
+          docker run --rm --platform ${{ matrix.docker_platform }} -v $(pwd):$(pwd) -e "RUST_LOG=fnm=debug" --workdir $(pwd) ${{matrix.docker_image}} bash -c '
             set -e
 
             apt update && apt install -y unzip curl libatomic1
@@ -53,13 +55,13 @@ jobs:
     strategy:
       matrix:
         shell: [fish, zsh, bash]
-        setup: 
+        setup:
           - os: ubuntu
-            script_arguments: ''
+            script_arguments: ""
           - os: macos
-            script_arguments: ''
+            script_arguments: ""
           - os: macos
-            script_arguments: '--force-no-brew'
+            script_arguments: "--force-no-brew"
     runs-on: ${{ matrix.setup.os }}-latest
     steps:
       - uses: actions/checkout@v4
@@ -84,4 +86,4 @@ jobs:
       - run: "env SHELL=$(which ${{ matrix.shell }}) bash ./.ci/install.sh ${{ matrix.setup.script_arguments }}"
         name: Run the installation script
       - run: ./.ci/test_installation_script.sh ${{ matrix.shell }}
-        name: 'Test installation script'
+        name: "Test installation script"

CHANGELOG.md

@@ -4,12 +4,16 @@
 
 ### Minor Changes
 
+- [#1516](https://github.com/Schniz/fnm/pull/1516) [`10c68cb`](https://github.com/Schniz/fnm/commit/10c68cb6630be811799afdccf212a399e08bef99) Thanks [@Schniz](https://github.com/Schniz)! - Reduce shell startup overhead for `env --use-on-cd` by applying the initial version during `fnm env`, instead of requiring an immediate extra `fnm use` subprocess from shell hook output.
+
 - [#1435](https://github.com/Schniz/fnm/pull/1435) [`1ebc90d`](https://github.com/Schniz/fnm/commit/1ebc90decf58c2176dcbd4f8ac00ecb3adb1de12) Thanks [@SunsetTechuila](https://github.com/SunsetTechuila)! - add `use` flag to the `install` command
 
 ### Patch Changes
 
 - [#1268](https://github.com/Schniz/fnm/pull/1268) [`ddab191`](https://github.com/Schniz/fnm/commit/ddab1911dc33a24aeec9d2b8139df1916c518d64) Thanks [@isaacl](https://github.com/isaacl)! - Make `fnm default` with no trailing positional argument to return the default version
 
+- [#1517](https://github.com/Schniz/fnm/pull/1517) [`d3747af`](https://github.com/Schniz/fnm/commit/d3747affd604223c752171c14944bd5773096b09) Thanks [@Schniz](https://github.com/Schniz)! - Improve `--use-on-cd` shell hook robustness by de-duplicating the zsh hook on re-source and fixing Windows CMD hook behavior for paths with spaces and drive changes.
+
 - [#1441](https://github.com/Schniz/fnm/pull/1441) [`bc4d19a`](https://github.com/Schniz/fnm/commit/bc4d19a481c11b4182f51683f03a8d366f1208d2) Thanks [@Schniz](https://github.com/Schniz)! - bump Rust toolchain to 1.88
 
 ## 1.38.1

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "fnm"
-version = "1.38.1"
-authors = ["Dargon789 <dargon789.uni.eth>"]
+version = "1.39.0"
+authors = ["Gal Schlezinger <gal@spitfire.co.il>"]
 edition = "2021"
 build = "build.rs"
 license = "GPL-3.0"
-repository = "https://github.com/Dargon789/fnm.git"
-description = "Fast and simple Node.js version manager, built in Rust"
+repository = "https://github.com/Schniz/fnm"
+description = "Fast and simple Node.js version manager"
 
 [dependencies]
 serde = { version = "1.0.203", features = ["derive"] }
@@ -16,27 +16,27 @@ chrono = { version = "0.4.38", features = ["serde", "now"], default-features = f
 tar = "0.4.40"
 xz2 = "0.1.7"
 node-semver = "2.1.0"
-etcetera = "0.11.0"
+etcetera = "0.8.0"
 colored = "2.1.0"
-zip = "6.0.0"
+zip = "2.1.0"
 tempfile = "3.10.1"
-indoc = "2.0.7"
+indoc = "2.0.5"
 log = "0.4.21"
 env_logger = "0.11.3"
 encoding_rs_io = "0.1.7"
-reqwest = { version = "0.13.0", features = ["blocking", "json", "rustls-tls", "rustls-tls-native-roots", "brotli"], default-features = false }
+reqwest = { version = "0.12.4", features = ["blocking", "json", "rustls-tls", "rustls-tls-native-roots", "brotli"], default-features = false }
 url = "2.5.0"
-sysinfo = "0.38.0"
+sysinfo = "0.30.12"
 thiserror = "1.0.61"
 clap_complete = "4.5.2"
 anyhow = "1.0.86"
-indicatif = { version = "0.18.0", features = ["improved_unicode"] }
-flate2 = "1.1.5"
+indicatif = { version = "0.17.8", features = ["improved_unicode"] }
+flate2 = "1.0.30"
 miette = { version = "7.2.0", features = ["fancy"] }
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
-duct = "1.0.0"
+duct = "0.13.7"
 test-log = "0.2.16"
 http = "1.1.0"
 

README.md

@@ -140,6 +140,9 @@ Please follow your shell instructions to install them.
 Environment variables need to be setup before you can start using fnm.
 This is done by evaluating the output of `fnm env`.
 
+> [!TIP]
+> Prefer passing an explicit shell (for example `fnm env --shell bash`) instead of relying on shell inference at runtime. It is a bit faster and avoids process tree detection.
+
 > [!NOTE]
 > Check out the [Configuration](./docs/configuration.md) section to enable highly
 > recommended features, like automatic version switching.
@@ -201,7 +204,7 @@ fnm env --use-on-cd --shell powershell | Out-String | Invoke-Expression
 
 #### Windows Command Prompt aka Batch aka WinCMD
 
-fnm is also supported but is not entirely covered. You can set up a startup script for [cmd.exe]( https://superuser.com/a/144348) or [Windows Terminal](https://superuser.com/a/1855283) and append the following lines:
+fnm is also supported but is not entirely covered. You can set up a startup script for [cmd.exe](https://superuser.com/a/144348) or [Windows Terminal](https://superuser.com/a/1855283) and append the following lines:
 
 ```batch
 @echo off