chore: add gateway env/process manager after rename
parent
2adb14c320
commit
55bffeba4a
|
|
@ -96,10 +96,10 @@ enum GatewayEnvironment {
|
||||||
message: "clawdis CLI not found in PATH; install the global package.")
|
message: "clawdis CLI not found in PATH; install the global package.")
|
||||||
}
|
}
|
||||||
|
|
||||||
let installedGateway = gatewayBin.flatMap { self.readGatewayVersion(binary: $0) }
|
let installed = gatewayBin.flatMap { self.readGatewayVersion(binary: $0) }
|
||||||
?? self.readLocalGatewayVersion(projectRoot: projectRoot)
|
?? self.readLocalGatewayVersion(projectRoot: projectRoot)
|
||||||
|
|
||||||
if let expected, let installed = installedGateway, !installed.compatible(with: expected) {
|
if let expected, let installed, !installed.compatible(with: expected) {
|
||||||
return GatewayEnvironmentStatus(
|
return GatewayEnvironmentStatus(
|
||||||
kind: .incompatible(found: installed.description, required: expected.description),
|
kind: .incompatible(found: installed.description, required: expected.description),
|
||||||
nodeVersion: runtime.version.description,
|
nodeVersion: runtime.version.description,
|
||||||
|
|
@ -109,7 +109,7 @@ enum GatewayEnvironment {
|
||||||
}
|
}
|
||||||
|
|
||||||
let gatewayLabel = gatewayBin != nil ? "global" : "local"
|
let gatewayLabel = gatewayBin != nil ? "global" : "local"
|
||||||
let gatewayVersionText = installedGateway?.description ?? "unknown"
|
let gatewayVersionText = installed?.description ?? "unknown"
|
||||||
return GatewayEnvironmentStatus(
|
return GatewayEnvironmentStatus(
|
||||||
kind: .ok,
|
kind: .ok,
|
||||||
nodeVersion: runtime.version.description,
|
nodeVersion: runtime.version.description,
|
||||||
|
|
|
||||||
|
|
@ -206,10 +206,6 @@ final class GatewayProcessManager: ObservableObject {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func clearLog() {
|
|
||||||
self.log = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
private func makeEnvironment() -> Environment {
|
private func makeEnvironment() -> Environment {
|
||||||
let merged = CommandResolver.preferredPaths().joined(separator: ":")
|
let merged = CommandResolver.preferredPaths().joined(separator: ":")
|
||||||
return .inherit.updating([
|
return .inherit.updating([
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue