Fix setup: shell PATH, restart race, Tailscale wait, macOS 27 grants
This commit is contained in:
@@ -343,10 +343,11 @@ enum Server {
|
||||
return try JSONDecoder().decode(TailnetInfo.self, from: data)
|
||||
}
|
||||
|
||||
// byre install copies its PATH into the service, which needs the login shell's to find claude, codex, agy and npx.
|
||||
// byre install copies its PATH into the service, which needs the interactive login shell's to find claude, codex, agy and npx:
|
||||
// installers such as claude's have the user add their directory to .zshrc, which only an interactive shell reads.
|
||||
private static func helper(_ command: String) async throws -> (status: Int32, output: String) {
|
||||
let shell = unsafe String(cString: getpwuid(getuid()).pointee.pw_shell)
|
||||
return try await execute(shell, ["-l", "-c", "exec \"$BYRE_HELPER\" \(command)"], env: ["BYRE_HELPER": serverHelper])
|
||||
return try await execute(shell, ["-l", "-i", "-c","exec \"$BYRE_HELPER\" \(command)"], env: ["BYRE_HELPER": serverHelper])
|
||||
}
|
||||
|
||||
static func checks() async throws -> Checks {
|
||||
|
||||
@@ -347,8 +347,8 @@ final class ConnectForm {
|
||||
}
|
||||
}
|
||||
group.addTask {
|
||||
try await Task.sleep(for: .seconds(15))
|
||||
throw ProcessFailure(errorDescription: "byre's Tailscale node is signed in but \(origin.absoluteString) didn't answer within 15 s.")
|
||||
try await Task.sleep(for: .seconds(120))
|
||||
throw ProcessFailure(errorDescription: "byre's Tailscale node is signed in but \(origin.absoluteString) didn't answer within 2 minutes.")
|
||||
}
|
||||
defer {
|
||||
group.cancelAll()
|
||||
|
||||
Reference in New Issue
Block a user