Merge pull request #1434 from mpociot/herd-patch

Only delete DNSMasq resolver when Herd is not installed
laravel · Aug 11, 2023 · 109c9d4 · 109c9d4
2 parents 4007d25 + 2320d15
commit 109c9d4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cli/Valet/DnsMasq.php b/cli/Valet/DnsMasq.php
@@ -43,8 +43,13 @@ public function uninstall(): void
         $this->brew->stopService('dnsmasq');
         $this->brew->uninstallFormula('dnsmasq');
         $this->cli->run('rm -rf '.BREW_PREFIX.'/etc/dnsmasq.d/dnsmasq-valet.conf');
-        $tld = $this->configuration->read()['tld'];
-        $this->files->unlink($this->resolverPath.'/'.$tld);
+
+        // As Laravel Herd uses the same DnsMasq resolver, we should only
+        // delete it if Herd is not installed.
+        if (!$this->files->exists('/Applications/Herd.app')) {
+            $tld = $this->configuration->read()['tld'];
+            $this->files->unlink($this->resolverPath . '/' . $tld);
+        }
     }
 
     /**