mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-03 19:10:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Munki7dev' into custom-sidebar

Browse Source
This commit is contained in:
Greg Neagle
2025-07-11 17:24:05 -07:00
parent ca62aac4f7 8fd09d9369
commit a5e9d209e4
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/cli/munki/shared/facts.swift
+2
View File
@@ -120,6 +120,8 @@ func getConditions() async -> PlistDict {
}
do {
let _ = try await runExternalScript(itemPath, timeout: 60)
} catch let ProcessError.error(description) {
display.error(description)
} catch {
display.error("Error while running \(itemPath): \(error.localizedDescription)")
}
code/cli/munki/shared/utils/scriptutils.swift
+1 -10
View File
@@ -191,16 +191,7 @@ func verifyFileOnlyWritableByMunkiAndRoot(_ path: String) throws {
/// Verifies path is executable
func verifyExecutable(_ path: String) throws {
let filemanager = FileManager.default
var attributes: NSDictionary
do {
attributes = try filemanager.attributesOfItem(atPath: path) as NSDictionary
} catch {
throw ExternalScriptError.statusError(
detail: "\(path): could not get filesystem attributes")
}
let mode = attributes.filePosixPermissions()
if Int32(mode) & X_OK == 0 {
if !FileManager.default.isExecutableFile(atPath: path) {
throw ExternalScriptError.statusError(
detail: "\(path) is not executable")
}