"ruderich.org/simon/safcm/remote"
)
-func (c *Conn) DialSSH(user, host string) error {
+func (c *Conn) DialSSH(user, host, sshConfig string) error {
if c.events == nil {
return fmt.Errorf("cannot reuse Conn")
}
// Help debugging by showing executed shell commands
opts += "x"
}
- c.cmd = exec.Command("ssh", remote, "/bin/sh", opts)
- c.remote = remote
+
+ c.sshRemote = remote
+ if sshConfig != "" {
+ c.sshOpts = append(c.sshOpts, "-F", sshConfig)
+ }
+ c.cmd = exec.Command("ssh",
+ append(append([]string{}, c.sshOpts...),
+ c.sshRemote, "/bin/sh", opts)...)
stdin, err := c.cmd.StdinPipe()
if err != nil {
path = strings.TrimSuffix(path, "\n")
c.debugf("DialSSH: uploading new remote to %q at %q",
- c.remote, path)
+ c.sshRemote, path)
- cmd := exec.Command("ssh", c.remote,
- fmt.Sprintf("cat > %q", path))
+ cmd := exec.Command("ssh",
+ append(append([]string{}, c.sshOpts...),
+ c.sshRemote,
+ fmt.Sprintf("cat > %q", path))...)
cmd.Stdin = bytes.NewReader(helper)
err = c.handleStderrAsEvents(cmd)
if err != nil {