CyberShell/backy
1
1
Fork 0
Code Issues 10 Pull Requests Packages Projects 1 Releases 20 Wiki Activity

changes in wording

Browse Source
This commit is contained in:
Andrew Woodlee
2023-01-02 12:04:00 -06:00
parent 0a1dbb61a1
commit d701d26938
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/backy/backy.go
View File

@@ -59,12 +59,12 @@ func (command Command) runCmd() logging.Logging {
remoteHost.Port = 22 remoteHost.Port = 22
remoteHost.Host = command.RemoteHost.Host remoteHost.Host = command.RemoteHost.Host
sshc, err := remoteHost.ConnectToSSHHost() sshConnection, err := remoteHost.ConnectToSSHHost()
if err != nil { if err != nil {
panic(fmt.Errorf("ssh dial: %w", err)) panic(fmt.Errorf("ssh dial: %w", err))
} }
defer sshc.Close() defer sshConnection.Close()
s, err := sshc.NewSession() s, err := sshConnection.NewSession()
if err != nil { if err != nil {
panic(fmt.Errorf("new ssh session: %w", err)) panic(fmt.Errorf("new ssh session: %w", err))
} }

8
pkg/backy/ssh.go
View File

@@ -51,7 +51,7 @@ func (config SshConfig) GetSSHConfig() (SshConfig, error) {
func (remoteConfig *Host) ConnectToSSHHost() (*ssh.Client, error) { func (remoteConfig *Host) ConnectToSSHHost() (*ssh.Client, error) {
var sshc *ssh.Client var sshConnection *ssh.Client
var connectErr error var connectErr error
f, _ := os.Open(filepath.Join(os.Getenv("HOME"), ".ssh", "config")) f, _ := os.Open(filepath.Join(os.Getenv("HOME"), ".ssh", "config"))
@@ -104,14 +104,14 @@ func (remoteConfig *Host) ConnectToSSHHost() (*ssh.Client, error) {
HostKeyCallback: ssh.InsecureIgnoreHostKey(), HostKeyCallback: ssh.InsecureIgnoreHostKey(),
} }
for _, host := range remoteConfig.HostName { for _, host := range remoteConfig.HostName {
sshc, connectErr = ssh.Dial("tcp", host, sshConfig) sshConnection, connectErr = ssh.Dial("tcp", host, sshConfig)
if connectErr != nil { if connectErr != nil {
continue break
} }
} }
break break
} }
} }
return sshc, connectErr return sshConnection, connectErr
} }