Fix spacetime version list not showing current version (#2680)

Co-authored-by: Zeke Foppa <[email protected]>

Author: bfops

crates/paths/src/cli.rs

@@ -85,7 +85,7 @@ impl VersionBinDir {
     }
 
     fn link_to(&self, path: &Path) -> anyhow::Result<()> {
-        let rel_path = path.strip_prefix(self).unwrap_or(path);
+        let rel_path = path.strip_prefix(self.0.parent().unwrap()).unwrap_or(path);
         #[cfg(unix)]
         {
             // remove the link if it already exists

crates/update/src/cli/list.rs

@@ -1,4 +1,5 @@
 use spacetimedb_paths::SpacetimePaths;
+use std::path::Path;
 
 /// List installed SpacetimeDB versions.
 #[derive(clap::Args)]
@@ -10,7 +11,31 @@ pub(super) struct List {
 
 impl List {
     pub(super) fn exec(self, paths: &SpacetimePaths) -> anyhow::Result<()> {
-        let current = paths.cli_bin_dir.current_version()?;
+        // This `match` part is only here because at one point we had a bug where we were creating
+        // symlinks that contained the _entire_ path, rather than just the relative path to the
+        // version directory. It's not strictly necessary, it just fixes our determination of what
+        // the current version is, for the output of this command.
+        //
+        // That symlink bug was fixed in `crates/paths/src/cli.rs` in
+        // https://github.com/clockworklabs/SpacetimeDB/pull/2680, but this `match` means that this
+        // output will still be correct for any users that already have one of the bugged symlinks.
+        //
+        // Once users upgrade to a version containing #2680, they will have the code that creates
+        // the fixed symlinks. However, that code won't immediately run, since the upgrade will be
+        // running from the previous binary they had. So once they upgrade to a version containing
+        // #2680, _and then_ upgrade once more, their symlinks will be fixed. There's no real
+        // timeline on when everyone will have done that, but hopefully that helps give a sense of
+        // how long this code "should" exist for (but it doesn't do any harm afaik).
+        let current = match paths.cli_bin_dir.current_version()? {
+            None => None,
+            Some(path_str) => {
+                let file_name = Path::new(&path_str)
+                    .file_name()
+                    .and_then(|f| f.to_str())
+                    .ok_or(anyhow::anyhow!("Could not extract current version"))?;
+                Some(file_name.to_string())
+            }
+        };
         let versions = if self.all {
             let client = super::reqwest_client()?;
             super::tokio_block_on(super::install::available_releases(&client))??