Print a message on -install if the CA is already installed
Updates #182
This commit is contained in:
parent
aa4dd61066
commit
25b1d39486
60
main.go
60
main.go
@ -242,37 +242,43 @@ func getCAROOT() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *mkcert) install() {
|
func (m *mkcert) install() {
|
||||||
var printed bool
|
if storeEnabled("system") {
|
||||||
if storeEnabled("system") && !m.checkPlatform() {
|
if m.checkPlatform() {
|
||||||
if m.installPlatform() {
|
log.Print("The local CA is already installed in the system trust store! 👍")
|
||||||
log.Print("The local CA is now installed in the system trust store! ⚡️")
|
|
||||||
}
|
|
||||||
m.ignoreCheckFailure = true // TODO: replace with a check for a successful install
|
|
||||||
printed = true
|
|
||||||
}
|
|
||||||
if storeEnabled("nss") && hasNSS && !m.checkNSS() {
|
|
||||||
if hasCertutil && m.installNSS() {
|
|
||||||
log.Printf("The local CA is now installed in the %s trust store (requires browser restart)! 🦊", NSSBrowsers)
|
|
||||||
} else if CertutilInstallHelp == "" {
|
|
||||||
log.Printf(`Note: %s support is not available on your platform. ℹ️`, NSSBrowsers)
|
|
||||||
} else if !hasCertutil {
|
|
||||||
log.Printf(`Warning: "certutil" is not available, so the CA can't be automatically installed in %s! ⚠️`, NSSBrowsers)
|
|
||||||
log.Printf(`Install "certutil" with "%s" and re-run "mkcert -install" 👈`, CertutilInstallHelp)
|
|
||||||
}
|
|
||||||
printed = true
|
|
||||||
}
|
|
||||||
if storeEnabled("java") && hasJava && !m.checkJava() {
|
|
||||||
if hasKeytool {
|
|
||||||
m.installJava()
|
|
||||||
log.Println("The local CA is now installed in Java's trust store! ☕️")
|
|
||||||
} else {
|
} else {
|
||||||
log.Println(`Warning: "keytool" is not available, so the CA can't be automatically installed in Java's trust store! ⚠️`)
|
if m.installPlatform() {
|
||||||
|
log.Print("The local CA is now installed in the system trust store! ⚡️")
|
||||||
|
}
|
||||||
|
m.ignoreCheckFailure = true // TODO: replace with a check for a successful install
|
||||||
}
|
}
|
||||||
printed = true
|
|
||||||
}
|
}
|
||||||
if printed {
|
if storeEnabled("nss") && hasNSS {
|
||||||
log.Print("")
|
if m.checkNSS() {
|
||||||
|
log.Printf("The local CA is already installed in the %s trust store! 👍", NSSBrowsers)
|
||||||
|
} else {
|
||||||
|
if hasCertutil && m.installNSS() {
|
||||||
|
log.Printf("The local CA is now installed in the %s trust store (requires browser restart)! 🦊", NSSBrowsers)
|
||||||
|
} else if CertutilInstallHelp == "" {
|
||||||
|
log.Printf(`Note: %s support is not available on your platform. ℹ️`, NSSBrowsers)
|
||||||
|
} else if !hasCertutil {
|
||||||
|
log.Printf(`Warning: "certutil" is not available, so the CA can't be automatically installed in %s! ⚠️`, NSSBrowsers)
|
||||||
|
log.Printf(`Install "certutil" with "%s" and re-run "mkcert -install" 👈`, CertutilInstallHelp)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if storeEnabled("java") && hasJava {
|
||||||
|
if m.checkJava() {
|
||||||
|
log.Println("The local CA is already installed in Java's trust store! 👍")
|
||||||
|
} else {
|
||||||
|
if hasKeytool {
|
||||||
|
m.installJava()
|
||||||
|
log.Println("The local CA is now installed in Java's trust store! ☕️")
|
||||||
|
} else {
|
||||||
|
log.Println(`Warning: "keytool" is not available, so the CA can't be automatically installed in Java's trust store! ⚠️`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log.Print("")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *mkcert) uninstall() {
|
func (m *mkcert) uninstall() {
|
||||||
|
Loading…
Reference in New Issue
Block a user