mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-09-11 12:56:03 +03:00
Add shell to ExecuteAction (#1430)
* Add shell to ExecuteAction * Update to 2.38.1 * Add shell argument to jsons
This commit is contained in:
parent
6694943ad8
commit
1645d419ce
@ -88,10 +88,12 @@ public struct Scheme: Equatable {
|
|||||||
public var script: String
|
public var script: String
|
||||||
public var name: String
|
public var name: String
|
||||||
public var settingsTarget: 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.script = script
|
||||||
self.name = name
|
self.name = name
|
||||||
self.settingsTarget = settingsTarget
|
self.settingsTarget = settingsTarget
|
||||||
|
self.shell = shell
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -400,6 +402,7 @@ extension Scheme.ExecutionAction: JSONObjectConvertible {
|
|||||||
script = try jsonDictionary.json(atKeyPath: "script")
|
script = try jsonDictionary.json(atKeyPath: "script")
|
||||||
name = jsonDictionary.json(atKeyPath: "name") ?? "Run Script"
|
name = jsonDictionary.json(atKeyPath: "name") ?? "Run Script"
|
||||||
settingsTarget = jsonDictionary.json(atKeyPath: "settingsTarget")
|
settingsTarget = jsonDictionary.json(atKeyPath: "settingsTarget")
|
||||||
|
shell = jsonDictionary.json(atKeyPath: "shell")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -409,6 +412,7 @@ extension Scheme.ExecutionAction: JSONEncodable {
|
|||||||
"script": script,
|
"script": script,
|
||||||
"name": name,
|
"name": name,
|
||||||
"settingsTarget": settingsTarget,
|
"settingsTarget": settingsTarget,
|
||||||
|
"shell": shell
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -208,7 +208,12 @@ public class SchemeGenerator {
|
|||||||
.first { settingsTarget == $0.buildableReference.blueprintName }?
|
.first { settingsTarget == $0.buildableReference.blueprintName }?
|
||||||
.buildableReference
|
.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?
|
let schemeTarget: ProjectTarget?
|
||||||
|
Loading…
Reference in New Issue
Block a user