1
0
mirror of https://github.com/laravel/valet.git synced 2026-02-07 01:00:09 +01:00

trying to delete nonexistent settings will fail

This commit is contained in:
kroko / Reinis Adovičs
2018-02-08 00:04:22 +02:00
committed by GitHub
parent 3f11288920
commit b32080b678

View File

@@ -226,13 +226,13 @@ function createCa()
if ($this->files->exists($caAffixPath)) {
$affix = $this->files->get($caAffixPath);
$this->cli->run(sprintf(
'sudo security delete-certificate -c "%s%s" -t /Library/Keychains/System.keychain',
'sudo security delete-certificate -c "%s%s" /Library/Keychains/System.keychain',
$cName, $affix
));
$this->files->unlink($caAffixPath);
}
$this->cli->run(sprintf(
'sudo security delete-certificate -c "%s" -t /Library/Keychains/System.keychain',
'sudo security delete-certificate -c "%s" /Library/Keychains/System.keychain',
$cName
));
@@ -377,8 +377,8 @@ function unsecure($url)
$this->files->unlink($this->certificatesPath().'/'.$url.'.csr');
$this->files->unlink($this->certificatesPath().'/'.$url.'.crt');
$this->cli->run(sprintf('sudo security delete-certificate -c "%s" -t /Library/Keychains/System.keychain', $url));
$this->cli->run(sprintf('sudo security delete-certificate -c "*.%s" -t /Library/Keychains/System.keychain', $url));
$this->cli->run(sprintf('sudo security delete-certificate -c "%s" /Library/Keychains/System.keychain', $url));
$this->cli->run(sprintf('sudo security delete-certificate -c "*.%s" /Library/Keychains/System.keychain', $url));
}
}