Setup proxies on use of a toolchain

Author: cmcgee1024

Sources/Swiftly/Init.swift

@@ -281,18 +281,8 @@ struct Init: SwiftlyCommand {
             """)
         }
 
-        // Fish doesn't have path caching, so this might only be needed for bash/zsh
-        if pathChanged && !quietShellFollowup && !shell.hasSuffix("fish") {
-            await ctx.message("""
-            Your shell caches items on your path for better performance. Swiftly has added
-            items to your path that may not get picked up right away. You can update your
-            shell's environment by running
-
-            hash -r
-
-            or restarting your shell.
-
-            """)
+        if pathChanged {
+            try await Self.handlePathChange(ctx)
         }
 
         if let postInstall {

Sources/Swiftly/Install.swift

@@ -121,26 +121,8 @@ struct Install: SwiftlyCommand {
             progressFile: self.progressFile
         )
 
-        let shell =
-            if let s = ProcessInfo.processInfo.environment["SHELL"]
-        {
-            s
-        } else {
-            try await Swiftly.currentPlatform.getShell()
-        }
-
-        // Fish doesn't cache its path, so this instruction is not necessary.
-        if pathChanged && !shell.hasSuffix("fish") {
-            await ctx.message(
-                """
-                NOTE: Swiftly has updated some elements in your path and your shell may not yet be
-                aware of the changes. You can update your shell's environment by running
-
-                hash -r
-
-                or restarting your shell.
-
-                """)
+        if pathChanged {
+            try await Self.handlePathChange(ctx)
         }
 
         if let postInstallScript {
@@ -410,7 +392,7 @@ struct Install: SwiftlyCommand {
                     verbose: verbose
                 )
 
-                let pathChanged = try await Self.setupProxies(
+                var pathChanged = try await Self.setupProxies(
                     ctx,
                     version: version,
                     verbose: verbose,
@@ -424,7 +406,8 @@ struct Install: SwiftlyCommand {
                 // If this is the first installed toolchain, mark it as in-use regardless of whether the
                 // --use argument was provided.
                 if useInstalledToolchain {
-                    try await Use.execute(ctx, version, globalDefault: false, &config)
+                    let pc = try await Use.execute(ctx, version, globalDefault: false, verbose: verbose, &config)
+                    pathChanged = pathChanged || pc
                 }
 
                 // We always update the global default toolchain if there is none set. This could

Sources/Swiftly/Swiftly.swift

@@ -132,4 +132,28 @@ extension SwiftlyCommand {
             }
         }
     }
+
+    public static func handlePathChange(_ ctx: SwiftlyCoreContext) async throws {
+        let shell =
+            if let s = ProcessInfo.processInfo.environment["SHELL"]
+        {
+            s
+        } else {
+            try await Swiftly.currentPlatform.getShell()
+        }
+
+        // Fish doesn't cache its path, so this instruction is not necessary.
+        if !shell.hasSuffix("fish") {
+            await ctx.message(
+                """
+                NOTE: Swiftly has updated some elements in your path and your shell may not yet be
+                aware of the changes. You can update your shell's environment by running
+
+                hash -r
+
+                or restarting your shell.
+
+                """)
+        }
+    }
 }

Sources/Swiftly/Uninstall.swift

@@ -119,7 +119,10 @@ struct Uninstall: SwiftlyCommand {
                     ?? config.listInstalledToolchains(selector: .latest).filter({ !toolchains.contains($0) }).max()
                     ?? config.installedToolchains.filter({ !toolchains.contains($0) }).max()
                 {
-                    try await Use.execute(ctx, toUse, globalDefault: true, &config)
+                    let pathChanged = try await Use.execute(ctx, toUse, globalDefault: true, verbose: self.root.verbose, &config)
+                    if pathChanged {
+                        try await Self.handlePathChange(ctx)
+                    }
                 } else {
                     // If there are no more toolchains installed, just unuse the currently active toolchain.
                     config.inUse = nil

Sources/Swiftly/Use.swift

@@ -121,11 +121,14 @@ struct Use: SwiftlyCommand {
             throw SwiftlyError(message: "No installed toolchains match \"\(toolchain)\"")
         }
 
-        try await Self.execute(ctx, toolchain, globalDefault: self.globalDefault, assumeYes: self.root.assumeYes, &config)
+        let pathChanged = try await Self.execute(ctx, toolchain, globalDefault: self.globalDefault, verbose: self.root.verbose, assumeYes: self.root.assumeYes, &config)
+        if pathChanged {
+            try await Self.handlePathChange(ctx)
+        }
     }
 
     /// Use a toolchain. This method can modify and save the input config and also create/modify a `.swift-version` file.
-    static func execute(_ ctx: SwiftlyCoreContext, _ toolchain: ToolchainVersion, globalDefault: Bool, assumeYes: Bool = true, _ config: inout Config) async throws {
+    static func execute(_ ctx: SwiftlyCoreContext, _ toolchain: ToolchainVersion, globalDefault: Bool, verbose: Bool, assumeYes: Bool = true, _ config: inout Config) async throws -> Bool {
         let (selectedVersion, result) = try await selectToolchain(ctx, config: &config, globalDefault: globalDefault)
 
         let isGlobal: Bool
@@ -142,7 +145,7 @@ struct Use: SwiftlyCommand {
 
                 guard await ctx.promptForConfirmation(defaultBehavior: true) else {
                     await ctx.message("Aborting setting in-use toolchain")
-                    return
+                    return false
                 }
             }
 
@@ -156,12 +159,21 @@ struct Use: SwiftlyCommand {
             configFile = nil
         }
 
+        let pathChanged = try await Install.setupProxies(
+            ctx,
+            version: toolchain,
+            verbose: verbose,
+            assumeYes: assumeYes
+        )
+
         try await ctx.output(ToolchainSetInfo(
             version: toolchain,
             previousVersion: selectedVersion,
             isGlobal: isGlobal,
             versionFile: configFile
         ))
+
+        return pathChanged
     }
 
     static func findNewVersionFile(_ ctx: SwiftlyCoreContext) async throws -> FilePath? {