Skip to content

Issue 4120 #10

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

Open
gitlost wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Issue 4120 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3755608
Add new function WP_CLI\Utils::maybe_prefix_env().
gitlost Jun 5, 2017
fb26c6b
Use maybe_prefix_env() in FeatureContent::run_sql().
gitlost Jun 5, 2017
4c0abd0
Make Utils\maybe_prefix_env() flexible and call directly in run_mysql…
gitlost Jun 5, 2017
d2be9e8
Make maybe_prefix_env test OS sensitive.
gitlost Jun 5, 2017
c40a740
Update comment.
gitlost Jun 5, 2017
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
25 changes: 24 additions & 1 deletion php/utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ function run_mysql_command( $cmd, $assoc_args, $descriptors = null ) {
$old_pass = getenv( 'MYSQL_PWD' );
putenv( 'MYSQL_PWD=' . $pass );

$final_cmd = $cmd . assoc_args_to_str( $assoc_args );
$final_cmd = maybe_prefix_env( $cmd ) . assoc_args_to_str( $assoc_args );

$proc = proc_open( $final_cmd, $descriptors, $pipes );
if ( !$proc )
Expand Down Expand Up @@ -980,3 +980,26 @@ function is_bundled_command( $command ) {
? array_key_exists( $command, $classes )
: false;
}

/**
* Maybe prefix command string with "/usr/bin/env".
* Removes (if there) if Windows, adds (if not there) if not.
*
* @param string $command
*
* @return string
*/
function maybe_prefix_env( $command ) {
$env_prefix = '/usr/bin/env ';
$env_prefix_len = strlen( $env_prefix );
if ( is_windows() ) {
if ( 0 === strncmp( $command, $env_prefix, $env_prefix_len ) ) {
$command = substr( $command, $env_prefix_len );
}
} else {
if ( 0 !== strncmp( $command, $env_prefix, $env_prefix_len ) ) {
$command = $env_prefix . $command;
}
}
return $command;
}
10 changes: 9 additions & 1 deletion tests/test-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,13 @@ public function testAssocArgsToString() {
) ) );
}

public function testMaybePreviewEnv() {
if ( 0 === strncasecmp( 'WIN', PHP_OS, 3 ) ) {
$this->assertSame( 'cmd', Utils\maybe_prefix_env( 'cmd' ) );
$this->assertSame( 'cmd', Utils\maybe_prefix_env( '/usr/bin/env cmd' ) );
} else {
$this->assertSame( '/usr/bin/env cmd', Utils\maybe_prefix_env( 'cmd' ) );
$this->assertSame( '/usr/bin/env cmd', Utils\maybe_prefix_env( '/usr/bin/env cmd' ) );
}
}
}