Move embedded remote helpers to cmd/safcm/

[safcm/safcm.git] / cmd / safcm / sync.go

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index 0f7c54ff309f360ac0e0bc9cbe4071a467c7c02b..bee0133e4fd4326ef1610325fc6ae8649147da29 100644 (file)
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -20,6 +20,7 @@ package main
 import (
        "flag"
        "fmt"
+       "io/fs"
        "log"
        "os"
        "os/signal"
@@ -369,9 +370,25 @@ func (s *Sync) Host(wg *sync.WaitGroup) error {
                wg.Done()
        }()
 
+       helpers, err := fs.Sub(RemoteHelpers, "remote")
+       if err != nil {
+               conn.Kill()
+               return err
+       }
+
        // Connect to remote host
-       err := conn.DialSSH(s.host.SshUser, s.host.Name, s.config.SshConfig)
+       user := s.host.SshUser
+       if user == "" {
+               user = s.config.SshUser
+       }
+       err = conn.DialSSH(rpc.SSHConfig{
+               Host:          s.host.Name,
+               User:          user,
+               SshConfig:     s.config.SshConfig,
+               RemoteHelpers: helpers,
+       })
        if err != nil {
+               conn.Kill()
                return err
        }
        defer conn.Kill()