Skip to content

Commit 219fe29

Browse files
committed
refactor: Add variables for exec programs
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 23fd254 commit 219fe29

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Diff for: cmd/limactl/guest_install.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,13 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
4949
return fmt.Errorf("instance %q is stopped, run `limactl start %s` to start the instance", instName, instName)
5050
}
5151

52+
sshExe := "ssh"
5253
sshConfig := filepath.Join(inst.Dir, filenames.SSHConfig)
5354
sshFlags := []string{"-F", sshConfig}
5455

56+
scpExe := "scp"
57+
scpFlags := sshFlags
58+
5559
y, err := inst.LoadYAML()
5660
if err != nil {
5761
return err
@@ -69,12 +73,12 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
6973
bin := prefix + "/bin/lima-guestagent"
7074
logrus.Infof("Copying %q to %s", guestAgentBinary, hostname)
7175
scpArgs := []string{guestAgentBinary, hostname + ":" + tmp}
72-
if err := runCmd("scp", sshFlags, scpArgs...); err != nil {
76+
if err := runCmd(scpExe, scpFlags, scpArgs...); err != nil {
7377
return nil
7478
}
7579
logrus.Infof("Installing %s to %s", tmp, bin)
7680
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 {
7882
return nil
7983
}
8084

@@ -88,12 +92,12 @@ func guestInstallAction(_ *cobra.Command, args []string) error {
8892
tmp := "/tmp/nerdctl-full.tgz"
8993
logrus.Infof("Copying %q to %s", nerdctlFilename, hostname)
9094
scpArgs := []string{nerdctlArchive, hostname + ":" + tmp}
91-
if err := runCmd("scp", sshFlags, scpArgs...); err != nil {
95+
if err := runCmd(scpExe, scpFlags, scpArgs...); err != nil {
9296
return nil
9397
}
9498
logrus.Infof("Installing %s in %s", tmp, prefix)
9599
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 {
97101
return nil
98102
}
99103
}

0 commit comments

Comments
 (0)