Avoid writing derived dosh_host in installers
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
This commit is contained in:
+2
-2
@@ -475,7 +475,7 @@ escape_key = "^]"
|
||||
$hostsConfig = Join-Path $configDir "hosts.toml"
|
||||
if ($ForceConfig -or -not (Test-Path $hostsConfig)) {
|
||||
$defaultServer = if ($Server) { $Server } else { "user@example.com" }
|
||||
$hostUdp = if ($DoshHost) { $DoshHost } else { $defaultServer }
|
||||
$hostUdpLine = if ($DoshHost) { "dosh_host = `"$DoshHost`"" } else { "# dosh_host = `"server.example.com`"" }
|
||||
@"
|
||||
# Example:
|
||||
# [server]
|
||||
@@ -487,7 +487,7 @@ if ($ForceConfig -or -not (Test-Path $hostsConfig)) {
|
||||
|
||||
[default]
|
||||
ssh = "$defaultServer"
|
||||
dosh_host = "$hostUdp"
|
||||
$hostUdpLine
|
||||
port = $Port
|
||||
predict = true
|
||||
"@ | Set-Content -NoNewline -Encoding utf8 $hostsConfig
|
||||
|
||||
+3
-3
@@ -687,9 +687,9 @@ EOF
|
||||
if [ "$force_config" -eq 1 ] || [ ! -f "$hosts_config" ]; then
|
||||
default_server="${server:-user@example.com}"
|
||||
if [ -n "$dosh_host" ]; then
|
||||
host_udp="$dosh_host"
|
||||
host_udp_line="dosh_host = \"$dosh_host\""
|
||||
else
|
||||
host_udp="$default_server"
|
||||
host_udp_line="# dosh_host = \"server.example.com\""
|
||||
fi
|
||||
cat >"$hosts_config" <<EOF
|
||||
# Example:
|
||||
@@ -702,7 +702,7 @@ EOF
|
||||
|
||||
[default]
|
||||
ssh = "$default_server"
|
||||
dosh_host = "$host_udp"
|
||||
$host_udp_line
|
||||
port = $port
|
||||
predict = true
|
||||
EOF
|
||||
|
||||
Reference in New Issue
Block a user