Skip to content

Don't require --allow-root with cli update; clarify docs #3576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielbachhuber merged 2 commits into from
Nov 16, 2016
Merged

Don't require --allow-root with cli update; clarify docs #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baf52da
Don't require `--allow-root` with `cli update`; clarify docs
danielbachhuber Nov 16, 2016
2d05e65
Prevent error notices when `arguments` doesn't contain two items
danielbachhuber Nov 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ WP-CLI version: 0.25.0

You can update WP-CLI with `wp cli update` ([doc](https://wp-cli.org/commands/cli/update/)), or by repeating the installation steps.

If WP-CLI is owned by root or another system user, you'll need to run `sudo wp cli update`.

Want to live life on the edge? Run `wp cli update --nightly` to use the latest nightly build of WP-CLI. The nightly build is more or less stable enough for you to use in your development environment, and always includes the latest and greatest WP-CLI features.

### Tab completions
Expand Down
12 changes: 9 additions & 3 deletions php/WP_CLI/Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,12 +661,18 @@ private function init_config() {
}

private function check_root() {
if ( $this->config['allow-root'] )
if ( $this->config['allow-root'] ) {
return; # they're aware of the risks!
if ( !function_exists( 'posix_geteuid') )
}
if ( count( $this->arguments ) >= 2 && 'cli' === $this->arguments[0] && 'update' === $this->arguments[1] ) {
return; # make it easier to update root-owned copies
}
if ( !function_exists( 'posix_geteuid') ) {
return; # posix functions not available
if ( posix_geteuid() !== 0 )
}
if ( posix_geteuid() !== 0 ) {
return; # not root
}

WP_CLI::error(
"YIKES! It looks like you're running this as root. You probably meant to " .
Expand Down