Issue #391 Fix adding user to group

The previous code had miscellaneous issues when dealing with usernames
containing accents. A reboot/relogin is still needed after doing this
addition.

Author: cfergeau

pkg/crc/preflight/preflight_checks_windows.go

@@ -3,14 +3,14 @@ package preflight
 import (
 	//"errors"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 
 	"github.com/code-ready/crc/pkg/crc/logging"
 	"github.com/code-ready/crc/pkg/crc/oc"
 
 	"github.com/code-ready/crc/pkg/crc/errors"
-	"github.com/code-ready/crc/pkg/os/windows/win32"
 	"github.com/code-ready/crc/pkg/os/windows/powershell"
 )
 
@@ -115,14 +115,13 @@ func fixUserPartOfHyperVAdmins() (bool, error) {
 	}
 	groupName := strings.TrimSpace(strings.Replace(strings.TrimSpace(outGroupName), "BUILTIN\\", "", -1))
 
-	outUsername, _, err := powershell.Execute(`Write-Host $env:USERNAME`)
+	username := os.Getenv("USERNAME")
+
+	netCmdArgs := fmt.Sprintf(`([adsi]"WinNT://./%s,group").Add("WinNT://%s,user")`, groupName, username)
+	_, _, err = powershell.ExecuteAsAdmin(netCmdArgs)
 	if err != nil {
 		return false, errors.New("Unable to get user name")
 	}
-	username := strings.TrimSpace(outUsername)
-
-	netCmdArgs := fmt.Sprintf(`localgroup "%s" "%s" /add`, groupName, username)
-	win32.ShellExecuteAsAdmin(win32.HWND_DESKTOP, "net", netCmdArgs, "", 0)
 
 	return true, nil
 }

pkg/os/windows/powershell/powershell_windows.go

@@ -76,7 +76,17 @@ func ExecuteAsAdmin(cmd string) (stdOut string, stdErr string, err error) {
 	}
 
 	// Write a temporary script
-	psFile.WriteString(scriptContent)
+	/* Add UTF-8 BOM at the beginning of the script so that Windows
+	 * correctly detects the file encoding
+	 */
+	_, err = psFile.Write([]byte{0xef, 0xbb, 0xbf})
+	if err != nil {
+		return "", "", err
+	}
+	_, err = psFile.WriteString(scriptContent)
+	if err != nil {
+		return "", "", err
+	}
 	psFile.Close()
 
 	return Execute(psFile.Name())