Print message to reload shell

Author: plemarquand

Sources/Swiftly/Init.swift

@@ -272,27 +272,11 @@ struct Init: SwiftlyCommand {
 
             // Fish doesn't have path caching, so this might only be needed for bash/zsh
             if pathChanged && !quietShellFollowup && !shell.hasSuffix("fish") {
-                ctx.print("""
-                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.
-
-                """)
+                ctx.print(Messages.refreshShell)
             }
 
             if let postInstall {
-                ctx.print("""
-                There are some dependencies that should be installed before using this toolchain.
-                You can run the following script as the system administrator (e.g. root) to prepare
-                your system:
-
-                    \(postInstall)
-
-                """)
+                ctx.print(Messages.postInstall(postInstall))
             }
         }
     }

Sources/Swiftly/Install.swift

@@ -96,41 +96,26 @@ struct Install: SwiftlyCommand {
 
         // Fish doesn't cache its path, so this instruction is not necessary.
         if pathChanged && !shell.hasSuffix("fish") {
-            ctx.print("""
-            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.
-
-            """)
+            ctx.print(Messages.refreshShell)
         }
 
         if let postInstallScript {
             guard let postInstallFile = self.postInstallFile else {
-                throw SwiftlyError(message: """
-
-                There are some dependencies that should be installed before using this toolchain.
-                You can run the following script as the system administrator (e.g. root) to prepare
-                your system:
-
-                \(postInstallScript)
-                """)
+                throw SwiftlyError(message: Messages.postInstall(postInstallScript))
             }
 
             try Data(postInstallScript.utf8).write(to: URL(fileURLWithPath: postInstallFile), options: .atomic)
         }
-    }    
-    
+    }
+
     public static func setupProxies(
         _ ctx: SwiftlyCoreContext,
         version: ToolchainVersion,
         verbose: Bool,
         assumeYes: Bool
     ) throws -> Bool {
         var pathChanged = false
-        
+
         // Create proxies if we have a location where we can point them
         if let proxyTo = try? Swiftly.currentPlatform.findSwiftlyBin(ctx) {
             // Ensure swiftly doesn't overwrite any existing executables without getting confirmation first.

Sources/Swiftly/Link.swift

@@ -32,11 +32,15 @@ struct Link: SwiftlyCommand {
             config: &config
         )
 
-        let _ = try Install.setupProxies(
+        let pathChanged = try Install.setupProxies(
             ctx,
             version: toolchainVersion,
             verbose: self.root.verbose,
             assumeYes: self.root.assumeYes
         )
+
+        if pathChanged {
+            ctx.print(Messages.refreshShell)
+        }
     }
 }

Sources/Swiftly/Unlink.swift

@@ -27,6 +27,7 @@ struct Unlink: SwiftlyCommand {
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
         try validateSwiftly(ctx)
 
+        var pathChanged = false
         if let proxyTo = try? Swiftly.currentPlatform.findSwiftlyBin(ctx) {
             let swiftlyBinDir = Swiftly.currentPlatform.swiftlyBinDir(ctx)
             let swiftlyBinDirContents = (try? FileManager.default.contentsOfDirectory(atPath: swiftlyBinDir.path)) ?? [String]()
@@ -43,8 +44,13 @@ struct Unlink: SwiftlyCommand {
 
                 if proxy.fileExists() {
                     try FileManager.default.removeItem(at: proxy)
+                    pathChanged = true
                 }
             }
         }
+
+        if pathChanged {
+            ctx.print(Messages.refreshShell)
+        }
     }
 }

Sources/Swiftly/Update.swift

@@ -141,15 +141,7 @@ struct Update: SwiftlyCommand {
         }
 
         if pathChanged {
-            ctx.print("""
-            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.
-
-            """)
+            ctx.print(Messages.refreshShell)
         }
     }
 

Sources/SwiftlyCore/Messages.swift

@@ -0,0 +1,22 @@
+public struct Messages {
+    public static let refreshShell = """
+    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.
+
+    """
+
+    public static func postInstall(_ message: String) -> String {
+        """
+        There are some dependencies that should be installed before using this toolchain.
+        You can run the following script as the system administrator (e.g. root) to prepare
+        your system:
+
+            \(message)
+
+        """
+    }
+}