stop warning msg of scp because of conflicting known_hosts file by us…

…ing /dev/null
mhewedy · May 10, 2020 · 3983e9d · 3983e9d
1 parent 935370d
commit 3983e9d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/command/commands.go b/command/commands.go
@@ -12,10 +12,16 @@ func VBoxManage(args ...string) *cmd {
 	}
 }
 
-func Scp(args ...string) *cmd {
+func Scp(extraArgs ...string) *cmd {
+	args := []string{"-q",
+		"-i", db.PrivateKeyPath,
+		"-o", "StrictHostKeyChecking=no",
+		"-o", "UserKnownHostsFile=/dev/null",
+	}
+
 	return &cmd{
 		command: "scp",
-		args:    args,
+		args:    append(args, extraArgs...),
 	}
 }
 
@@ -27,18 +33,16 @@ func Arp(args ...string) *cmd {
 }
 
 func Ssh(ipAddr string, extraArgs ...string) *cmd {
-
 	args := []string{"-i", db.PrivateKeyPath,
 		"-o", "StrictHostKeyChecking=no",
 		"-o", "GlobalKnownHostsFile=/dev/null",
 		"-o", "UserKnownHostsFile=/dev/null",
 		"-o", "LogLevel=error",
 		db.Username + "@" + ipAddr}
-	args = append(args, extraArgs...)
 
 	return &cmd{
 		command: "ssh",
-		args:    args,
+		args:    append(args, extraArgs...),
 	}
 }
 

diff --git a/command/scp/scp.go b/command/scp/scp.go
@@ -17,7 +17,7 @@ func CopyToVM(vmName string, localFile string, vmFile string) error {
 		return err
 	}
 
-	_, err = command.Scp("-i", db.PrivateKeyPath, localFile, db.Username+"@"+ipAddr+":"+vmFile).Call()
+	_, err = command.Scp(localFile, db.Username+"@"+ipAddr+":"+vmFile).Call()
 
 	return err
 }
@@ -28,7 +28,7 @@ func CopyToLocalCWD(vmName string, vmFile string) error {
 		return err
 	}
 
-	_, err = command.Scp("-i", db.PrivateKeyPath, db.Username+"@"+ipAddr+":"+vmFile, "./").Call()
+	_, err = command.Scp(db.Username+"@"+ipAddr+":"+vmFile, "./").Call()
 
 	return err
 }