Add shell to ExecuteAction (#1430)

* Add shell to ExecuteAction

* Update to 2.38.1

* Add shell argument to jsons
This commit is contained in:
Balazs Perlaki-Horvath 2024-04-07 14:38:04 +02:00 committed by GitHub
parent 6694943ad8
commit 1645d419ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions

View File

@ -88,10 +88,12 @@ public struct Scheme: Equatable {
public var script: String
public var name: String
public var settingsTarget: String?
public init(name: String, script: String, settingsTarget: String? = nil) {
public var shell: String?
public init(name: String, script: String, shell: String? = nil, settingsTarget: String? = nil) {
self.script = script
self.name = name
self.settingsTarget = settingsTarget
self.shell = shell
}
}
@ -400,6 +402,7 @@ extension Scheme.ExecutionAction: JSONObjectConvertible {
script = try jsonDictionary.json(atKeyPath: "script")
name = jsonDictionary.json(atKeyPath: "name") ?? "Run Script"
settingsTarget = jsonDictionary.json(atKeyPath: "settingsTarget")
shell = jsonDictionary.json(atKeyPath: "shell")
}
}
@ -409,6 +412,7 @@ extension Scheme.ExecutionAction: JSONEncodable {
"script": script,
"name": name,
"settingsTarget": settingsTarget,
"shell": shell
]
}
}

View File

@ -208,7 +208,12 @@ public class SchemeGenerator {
.first { settingsTarget == $0.buildableReference.blueprintName }?
.buildableReference
}
return XCScheme.ExecutionAction(scriptText: action.script, title: action.name, environmentBuildable: environmentBuildable)
return XCScheme.ExecutionAction(
scriptText: action.script,
title: action.name,
shellToInvoke: action.shell,
environmentBuildable: environmentBuildable
)
}
let schemeTarget: ProjectTarget?