phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-06 16:50:09 +01:00
Code Activity

Allow Valet to uninstall itself

Browse Source 
`valet uninstall` only displays information about how to manually uninstall and clean up after Valet.

This PR adds a `--force` parameter, which will forcefully remove Valet and the Homebrew services it installs, as well as clean up the config files and log files.
But for a few post-uninstall composer dependencies, cleanup is very thorough.

This brings idempotency to both `valet install` and `valet uninstall --force`

(There may still be edge cases where other Homebrew or composer packages might create interference with install/uninstall, but this makes things much easier to self-troubleshoot.)
This commit is contained in:
Chris Brown
2019-12-05 19:50:33 -05:00
parent d301e4ac11
commit 6e01bfb5f4
7 changed files with 205 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
cli/Valet/Brew.php
View File

@@ -62,7 +62,7 @@ function hasInstalledPhp()
}
/**
* Get a list of supported PHP versions
* Get a list of supported PHP versions.
*
* @return \Illuminate\Support\Collection
*/
@@ -83,7 +83,7 @@ function hasInstalledNginx()
}
/**
* Return name of the nginx service installed via Homebrewed.
* Return name of the nginx service installed via Homebrew.
*
* @return string
*/
@@ -185,7 +185,7 @@ function stopService($services)
}
/**
* Determine if php is currently linked
* Determine if php is currently linked.
*
* @return bool
*/
@@ -195,7 +195,7 @@ function hasLinkedPhp()
}
/**
* Get the linked php parsed
* Get the linked php parsed.
*
* @return mixed
*/
@@ -277,7 +277,17 @@ function createSudoersEntry()
}
/**
* Link passed formula
* Remove the "sudoers.d" entry for running Brew.
*
* @return void
*/
function removeSudoersEntry()
{
$this->cli->quietly('rm /etc/sudoers.d/brew');
}
/**
* Link passed formula.
*
* @param $formula
* @param bool $force
@@ -297,7 +307,7 @@ function ($exitCode, $errorOutput) use ($formula) {
}
/**
* Unlink passed formula
* Unlink passed formula.
* @param $formula
*
* @return string
@@ -315,7 +325,7 @@ function ($exitCode, $errorOutput) use ($formula) {
}
/**
* Get the currently running brew services
* Get the currently running brew services.
*
* @return \Illuminate\Support\Collection
*/
@@ -330,4 +340,45 @@ function ($exitCode, $errorOutput) {
}
))));
}
/**
* Tell Homebrew to forcefully remove all PHP versions that Valet supports.
*
* @return string
*/
function uninstallAllPhpVersions()
{
$this->supportedPhpVersions()->each(function ($formula) {
$this->uninstallFormula($formula);
});
return 'PHP versions removed.';
}
/**
* Uninstall a Homebrew app by formula name.
* @param string $formula
*
* @return void
*/
function uninstallFormula($formula)
{
$this->cli->runAsUser('brew uninstall --force '.$formula);
$this->cli->run('rm -rf /usr/local/Cellar/'.$formula);
}
/**
* Run Homebrew's cleanup commands.
*
* @return string
*/
function cleanupBrew()
{
return $this->cli->runAsUser(
'brew cleanup && brew services cleanup',
function ($exitCode, $errorOutput) {
output($errorOutput);
}
);
}
}

10
cli/Valet/Configuration.php
View File

@@ -34,6 +34,16 @@ function install()
$this->files->chown($this->path(), user());
}
/**
* Forcefully delete the Valet home configuration directory and contents.
*
* @return void
*/
function uninstall()
{
$this->files->unlink(VALET_HOME_PATH);
}
/**
* Create the Valet configuration directory.
*

17
cli/Valet/DnsMasq.php
View File

@@ -51,6 +51,23 @@ function install($tld = 'test')
info('Valet is configured to serve for TLD [.'.$tld.']');
}
/**
* Forcefully uninstall dnsmasq.
*
* @return void
*/
function uninstall()
{
$this->brew->stopService('dnsmasq');
$this->brew->uninstallFormula('dnsmasq');
$this->cli->run('rm -rf /usr/local/etc/dnsmasq.d/dnsmasq-valet.conf');
}
/**
* Tell Homebrew to restart dnsmasq
*
* @return void
*/
function restart()
{
$this->brew->restartService('dnsmasq');

6
cli/Valet/Nginx.php
View File

@@ -160,12 +160,14 @@ function stop()
}
/**
* Prepare Nginx for uninstallation.
* Forcefully uninstall Nginx.
*
* @return void
*/
function uninstall()
{
$this->stop();
$this->brew->stopService(['nginx', 'nginx-full']);
$this->brew->uninstallFormula('nginx nginx-full');
$this->cli->quietly('rm -rf /usr/local/etc/nginx /usr/local/var/log/nginx');
}
}

12
cli/Valet/PhpFpm.php
View File

@@ -45,6 +45,18 @@ function install()
$this->restart();
}
/**
* Forcefully uninstall all of Valet's supported PHP versions and configurations
*
* @return void
*/
function uninstall()
{
$this->brew->uninstallAllPhpVersions();
rename('/usr/local/etc/php', '/usr/local/etc/php-valet-bak'.time());
$this->cli->run('rm -rf /usr/local/var/log/php-fpm.log');
}
/**
* Update the PHP FPM configuration.
*

36
cli/Valet/Valet.php
View File

@@ -34,6 +34,16 @@ function symlinkToUsersBin()
$this->cli->runAsUser('ln -s "'.realpath(__DIR__.'/../../valet').'" '.$this->valetBin);
}
/**
* Remove the symlink from the user's local bin.
*
* @return void
*/
function unlinkFromUsersBin()
{
$this->cli->quietlyAsUser('rm '.$this->valetBin);
}
/**
* Get the paths to all of the Valet extensions.
*
@@ -81,4 +91,30 @@ function createSudoersEntry()
$this->files->put('/etc/sudoers.d/valet', 'Cmnd_Alias VALET = /usr/local/bin/valet *
%admin ALL=(root) NOPASSWD:SETENV: VALET'.PHP_EOL);
}
/**
* Remove the "sudoers.d" entry for running Valet.
*
* @return void
*/
function removeSudoersEntry()
{
$this->cli->quietly('rm /etc/sudoers.d/valet');
}
/**
* Run composer global diagnose
*/
function composerGlobalDiagnose()
{
$this->cli->runAsUser('composer global diagnose');
}
/**
* Run composer global update
*/
function composerGlobalUpdate()
{
$this->cli->runAsUser('composer global update');
}
}