Skip to content

Model additional system commands #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 30, 2025
Merged

Model additional system commands #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8dc6b7e
Model the pkgbuild command
cmcgee1024 Apr 25, 2025
aba929f
Model the Linux getent command
cmcgee1024 Apr 25, 2025
a5dca08
Model a small subset of the git command
cmcgee1024 Apr 25, 2025
1e3fa1c
Replace array += with append to save on allocations
cmcgee1024 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Sources/LinuxPlatform/Linux.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Foundation
import SwiftlyCore
import SystemPackage

typealias sys = SwiftlyCore.SystemCommand
typealias fs = SwiftlyCore.FileSystem

/// `Platform` implementation for Linux systems.
Expand Down Expand Up @@ -605,15 +606,8 @@ 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(prefix) {
if case let comps = line.components(separatedBy: ":"), comps.count > 1 {
return comps[comps.count - 1]
}
}
}
if let entry = try await sys.getent(database: "passwd", keys: userName).entries(self).first {
if let shell = entry.last { return shell }
}

// Fall back on bash on Linux and other Unixes
Expand Down
Loading