Use a better method to reload command presets
This commit is contained in:
@@ -203,28 +203,20 @@ func newSSH(
|
||||
}
|
||||
}
|
||||
|
||||
func parseSSHConfig(p configuration.Configuration) configuration.Configuration {
|
||||
for i := range p.Presets {
|
||||
if p.Presets[i].Type != "SSH" {
|
||||
continue
|
||||
}
|
||||
func parseSSHConfig(p configuration.Preset) (configuration.Preset, error) {
|
||||
oldHost := p.Host
|
||||
|
||||
oldHost := p.Presets[i].Host
|
||||
_, _, sErr := net.SplitHostPort(p.Host)
|
||||
|
||||
_, _, sErr := net.SplitHostPort(p.Presets[i].Host)
|
||||
|
||||
if sErr != nil {
|
||||
p.Presets[i].Host = net.JoinHostPort(
|
||||
p.Presets[i].Host,
|
||||
sshDefaultPortString)
|
||||
}
|
||||
|
||||
if len(p.Presets[i].Host) <= 0 {
|
||||
p.Presets[i].Host = oldHost
|
||||
}
|
||||
if sErr != nil {
|
||||
p.Host = net.JoinHostPort(p.Host, sshDefaultPortString)
|
||||
}
|
||||
|
||||
return p
|
||||
if len(p.Host) <= 0 {
|
||||
p.Host = oldHost
|
||||
}
|
||||
|
||||
return p, nil
|
||||
}
|
||||
|
||||
func (d *sshClient) Bootup(
|
||||
|
||||
Reference in New Issue
Block a user