Merge pull request #1863 from pendo324/windows-ssh-quoting

fix: Windows ssh command quoting

Author: AkihiroSuda

pkg/sshutil/sshutil.go

@@ -138,8 +138,10 @@ func CommonOpts(useDotSSH bool) ([]string, error) {
 	var opts []string
 	if runtime.GOOS == "windows" {
 		privateKeyPath = ioutilx.CanonicalWindowsPath(privateKeyPath)
+		opts = []string{fmt.Sprintf(`IdentityFile='%s'`, privateKeyPath)}
+	} else {
+		opts = []string{fmt.Sprintf(`IdentityFile="%s"`, privateKeyPath)}
 	}
-	opts = []string{fmt.Sprintf(`IdentityFile="%s"`, privateKeyPath)}
 
 	// Append all private keys corresponding to ~/.ssh/*.pub to keep old instances working
 	// that had been created before lima started using an internal identity.
@@ -170,7 +172,11 @@ func CommonOpts(useDotSSH bool) ([]string, error) {
 				// Fail on permission-related and other path errors
 				return nil, err
 			}
-			opts = append(opts, "IdentityFile=\""+privateKeyPath+"\"")
+			if runtime.GOOS == "windows" {
+				opts = append(opts, fmt.Sprintf(`IdentityFile='%s'`, privateKeyPath))
+			} else {
+				opts = append(opts, fmt.Sprintf(`IdentityFile="%s"`, privateKeyPath))
+			}
 		}
 	}
 
@@ -229,10 +235,11 @@ func SSHOpts(instDir string, useDotSSH, forwardAgent bool, forwardX11 bool, forw
 	if err != nil {
 		return nil, err
 	}
+	controlPath := fmt.Sprintf(`ControlPath="%s"`, controlSock)
 	if runtime.GOOS == "windows" {
 		controlSock = ioutilx.CanonicalWindowsPath(controlSock)
+		controlPath = fmt.Sprintf(`ControlPath='%s'`, controlSock)
 	}
-	controlPath := fmt.Sprintf(`ControlPath="%s"`, controlSock)
 	opts = append(opts,
 		fmt.Sprintf("User=%s", u.Username), // guest and host have the same username, but we should specify the username explicitly (#85)
 		"ControlMaster=auto",