@@ -49,9 +49,13 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
49
49
return fmt .Errorf ("instance %q is stopped, run `limactl start %s` to start the instance" , instName , instName )
50
50
}
51
51
52
+ sshExe := "ssh"
52
53
sshConfig := filepath .Join (inst .Dir , filenames .SSHConfig )
53
54
sshFlags := []string {"-F" , sshConfig }
54
55
56
+ scpExe := "scp"
57
+ scpFlags := sshFlags
58
+
55
59
y , err := inst .LoadYAML ()
56
60
if err != nil {
57
61
return err
@@ -69,12 +73,12 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
69
73
bin := prefix + "/bin/lima-guestagent"
70
74
logrus .Infof ("Copying %q to %s" , guestAgentBinary , hostname )
71
75
scpArgs := []string {guestAgentBinary , hostname + ":" + tmp }
72
- if err := runCmd ("scp" , sshFlags , scpArgs ... ); err != nil {
76
+ if err := runCmd (scpExe , scpFlags , scpArgs ... ); err != nil {
73
77
return nil
74
78
}
75
79
logrus .Infof ("Installing %s to %s" , tmp , bin )
76
80
sshArgs := []string {hostname , "sudo" , "install" , "-m" , "755" , tmp , bin }
77
- if err := runCmd ("ssh" , sshFlags , sshArgs ... ); err != nil {
81
+ if err := runCmd (sshExe , sshFlags , sshArgs ... ); err != nil {
78
82
return nil
79
83
}
80
84
@@ -88,12 +92,12 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
88
92
tmp := "/tmp/nerdctl-full.tgz"
89
93
logrus .Infof ("Copying %q to %s" , nerdctlFilename , hostname )
90
94
scpArgs := []string {nerdctlArchive , hostname + ":" + tmp }
91
- if err := runCmd ("scp" , sshFlags , scpArgs ... ); err != nil {
95
+ if err := runCmd (scpExe , scpFlags , scpArgs ... ); err != nil {
92
96
return nil
93
97
}
94
98
logrus .Infof ("Installing %s in %s" , tmp , prefix )
95
99
sshArgs := []string {hostname , "sudo" , "tar" , "Cxzf" , prefix , tmp }
96
- if err := runCmd ("ssh" , sshFlags , sshArgs ... ); err != nil {
100
+ if err := runCmd (sshExe , sshFlags , sshArgs ... ); err != nil {
97
101
return nil
98
102
}
99
103
}
0 commit comments