Quellcode durchsuchen

java: don't attempt sudo retry on windows (#85)

* java: don't attempt retry on windows
* docs: mention "Run as Administrator" for windows if needed

Fixes #84
Adam Shannon vor 6 Jahren
Ursprung
Commit
ea716f38b3
2 geänderte Dateien mit 3 neuen und 1 gelöschten Zeilen
  1. 2 0
      README.md
  2. 1 1
      truststore_java.go

+ 2 - 0
README.md

@@ -100,6 +100,8 @@ scoop install mkcert
 
 or build from source (requires Go 1.10+), or use [the pre-built binaries](https://github.com/FiloSottile/mkcert/releases).
 
+If you're running into permission problems try running `mkcert` as an Administrator.
+
 ## Supported root stores
 
 mkcert supports the following root stores:

+ 1 - 1
truststore_java.go

@@ -112,7 +112,7 @@ func (m *mkcert) uninstallJava() {
 // the command wrapped in 'sudo' to work around file permissions.
 func (m *mkcert) execKeytool(cmd *exec.Cmd) ([]byte, error) {
 	out, err := cmd.CombinedOutput()
-	if err != nil && bytes.Contains(out, []byte("java.io.FileNotFoundException")) {
+	if err != nil && bytes.Contains(out, []byte("java.io.FileNotFoundException")) && runtime.GOOS != "windows" {
 		origArgs := cmd.Args[1:]
 		cmd = exec.Command("sudo", keytoolPath)
 		cmd.Args = append(cmd.Args, origArgs...)