Merge branch 'trs/preserve-standalone-installer-destination'

Author: tsibley

CHANGES.md

@@ -81,6 +81,12 @@ supported Python version is always bundled with `nextstrain`.
   in the wrong location.
   ([#476](https://github.com/nextstrain/cli/issues/476))
 
+* When a standalone installation of Nextstrain CLI suggests a command to run to
+  update itself, that command now takes into account non-default installation
+  paths so that the new version is installed to the same place as the current
+  version.
+  ([#474](https://github.com/nextstrain/cli/pull/474))
+
 # 10.2.1.post1 (1 July 2025)
 
 _See also changes in 10.2.1 which was an unreleased version._

doc/changes.md

@@ -86,6 +86,12 @@ supported Python version is always bundled with `nextstrain`.
   in the wrong location.
   ([#476](https://github.com/nextstrain/cli/issues/476))
 
+* When a standalone installation of Nextstrain CLI suggests a command to run to
+  update itself, that command now takes into account non-default installation
+  paths so that the new version is installed to the same place as the current
+  version.
+  ([#474](https://github.com/nextstrain/cli/pull/474))
+
 (v10-2-1-post1)=
 ## 10.2.1.post1 (1 July 2025)
 

nextstrain/cli/util.py

@@ -235,15 +235,16 @@ def standalone_installation_path() -> Optional[Path]:
 
 def standalone_installer(version: str) -> str:
     system = platform.system()
+    destination = str(standalone_installation_path() or "")
 
     if system == "Linux":
-        return f"curl -fsSL --proto '=https' https://nextstrain.org/cli/installer/linux | bash -s {shquote(version)}"
+        return f"curl -fsSL --proto '=https' https://nextstrain.org/cli/installer/linux | DESTINATION={shquote(destination)} bash -s {shquote(version)}"
 
     elif system == "Darwin":
-        return f"curl -fsSL --proto '=https' https://nextstrain.org/cli/installer/mac | bash -s {shquote(version)}"
+        return f"curl -fsSL --proto '=https' https://nextstrain.org/cli/installer/mac | DESTINATION={shquote(destination)} bash -s {shquote(version)}"
 
     elif system == "Windows":
-        return 'Invoke-Expression "& { $(Invoke-RestMethod https://nextstrain.org/cli/installer/windows) } %s"' % shquote(version)
+        return '$env:DESTINATION=%s; Invoke-Expression "& { $(Invoke-RestMethod https://nextstrain.org/cli/installer/windows) } %s"' % (shquote(destination), shquote(version))
 
     else:
         raise RuntimeError(f"unknown system {system!r}")