chore: general clean up

Author: louisunlimited

Sources/Swiftly/SelfUninstall.swift

@@ -1,11 +1,13 @@
+// SelfUninstall.swift
+
 import ArgumentParser
 import Foundation
 import SwiftlyCore
 import SystemPackage
 
 struct SelfUninstall: SwiftlyCommand {
-    public static let configuration = CommandConfiguration(
-        abstract: "Uninstall swiftly itself.",
+    static let configuration = CommandConfiguration(
+        abstract: "Uninstall swiftly itself."
     )
 
     @OptionGroup var root: GlobalOptions
@@ -19,24 +21,22 @@ struct SelfUninstall: SwiftlyCommand {
     }
 
     mutating func run(_ ctx: SwiftlyCoreContext) async throws {
-        let _ = try await validateSwiftly(ctx)
+        _ = try await validateSwiftly(ctx)
         let swiftlyBin = Swiftly.currentPlatform.swiftlyBinDir(ctx)
 
         guard try await fs.exists(atPath: swiftlyBin) else {
             throw SwiftlyError(
-                message:
-                "Self uninstall doesn't work when swiftly has been installed externally. Please uninstall it from the source where you installed it in the first place."
+                message: "Self uninstall doesn't work when swiftly has been installed externally. Please uninstall it from the source where you installed it in the first place."
             )
         }
 
         if !self.root.assumeYes {
             await ctx.print("""
-            You are about to uninstall swiftly. 
-            This will remove the swiftly binary and all the files in the swiftly home directory. 
-            All installed toolchains will not be removed, if you want to remove them, please do so manually with `swiftly uninstall all`.
+            You are about to uninstall swiftly.
+            This will remove the swiftly binary and all files in the swiftly home directory.
+            Installed toolchains will not be removed. To remove them, run `swiftly uninstall all`.
             This action is irreversible.
             """)
-
             guard await ctx.promptForConfirmation(defaultBehavior: true) else {
                 throw SwiftlyError(message: "swiftly installation has been cancelled")
             }
@@ -45,7 +45,7 @@ struct SelfUninstall: SwiftlyCommand {
         try await Self.execute(ctx, verbose: self.root.verbose)
     }
 
-    public static func execute(_ ctx: SwiftlyCoreContext, verbose _: Bool) async throws {
+    static func execute(_ ctx: SwiftlyCoreContext, verbose _: Bool) async throws {
         await ctx.print("Uninstalling swiftly...")
 
         let userHome = ctx.mockedHomeDir ?? fs.home
@@ -71,32 +71,31 @@ struct SelfUninstall: SwiftlyCommand {
             userHome / ".profile",
         ]
 
-        // Handle fish shell config
+        // Add fish shell config path
         if let xdgConfigHome = ProcessInfo.processInfo.environment["XDG_CONFIG_HOME"] {
             profilePaths.append(FilePath(xdgConfigHome) / "fish/conf.d/swiftly.fish")
         } else {
             profilePaths.append(userHome / ".config/fish/conf.d/swiftly.fish")
         }
 
-        await ctx.print("Scanning shell profile files to remove swiftly source line...")
-
-        // remove swiftly source line from shell profile files
-        for path in profilePaths {
-            if try await fs.exists(atPath: path) {
-                await ctx.print("Removing swiftly source line from \(path)...")
-                let isFishProfile = path.extension == "fish"
-                let sourceLine = isFishProfile ? fishSourceLine : shSourceLine
-                if case let profileContents = try String(contentsOf: path, encoding: .utf8), profileContents.contains(sourceLine) {
-                    let newContents = profileContents.replacingOccurrences(of: sourceLine, with: "")
-                    try Data(newContents.utf8).write(to: path, options: [.atomic])
-                }
+        await ctx.print("Cleaning up shell profile files...")
+
+        // Remove swiftly source lines from shell profiles
+        for path in profilePaths where try await fs.exists(atPath: path) {
+            await ctx.print("Updating \(path)...")
+            let isFish = path.extension == "fish"
+            let sourceLine = isFish ? fishSourceLine : shSourceLine
+            let contents = try String(contentsOf: path, encoding: .utf8)
+            if contents.contains(sourceLine) {
+                let updated = contents.replacingOccurrences(of: sourceLine, with: "")
+                try Data(updated.utf8).write(to: path, options: [.atomic])
             }
         }
 
-        await ctx.print("Removing swiftly binary from \(swiftlyBin)...")
+        await ctx.print("Removing swiftly binary at \(swiftlyBin)...")
         try await fs.remove(atPath: swiftlyBin)
 
-        await ctx.print("Removing swiftly home directory from \(swiftlyHome)...")
+        await ctx.print("Removing swiftly home directory at \(swiftlyHome)...")
         try await fs.remove(atPath: swiftlyHome)
 
         await ctx.print("Swiftly uninstalled successfully.")