Check prefix for the current user on Linux when finding the shell (#206)

cmcgee1024 · web-flow · commit 51496e5e7601 · 2025-01-27T11:49:47.000-05:00
Check the correct prefix for the current user on Linux when finding their shell
diff --git a/Sources/LinuxPlatform/Linux.swift b/Sources/LinuxPlatform/Linux.swift
@@ -543,9 +543,11 @@ public struct Linux: Platform {
     }
 
     public func getShell() async throws -> String {
+        let userName = ProcessInfo.processInfo.userName
+        let prefix = "\(userName):"
         if let passwds = try await runProgramOutput("getent", "passwd") {
             for line in passwds.components(separatedBy: "\n") {
-                if line.hasPrefix("root:") {
+                if line.hasPrefix(prefix) {
                     if case let comps = line.components(separatedBy: ":"), comps.count > 1 {
                         return comps[comps.count - 1]
                     }

Original file line number	Diff line number	Diff line change
`@@ -543,9 +543,11 @@ public struct Linux: Platform {`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`public func getShell() async throws -> String {`
	`546`	`+ let userName = ProcessInfo.processInfo.userName`
	`547`	`+ let prefix = "\(userName):"`
`546`	`548`	`if let passwds = try await runProgramOutput("getent", "passwd") {`
`547`	`549`	`for line in passwds.components(separatedBy: "\n") {`
`548`		`- if line.hasPrefix("root:") {`
	`550`	`+ if line.hasPrefix(prefix) {`
`549`	`551`	`if case let comps = line.components(separatedBy: ":"), comps.count > 1 {`
`550`	`552`	`return comps[comps.count - 1]`
`551`	`553`	`}`