Merge pull request #113 from wp-cli/issue_112

danielbachhuber · web-flow · commit c5f9c034fd71 · 2017-07-26T11:17:52.000-07:00
Suppress tput stderr. Use COLUMNS env var 1st if available.
diff --git a/lib/cli/Shell.php b/lib/cli/Shell.php
@@ -49,8 +49,10 @@ static public function columns() {
 						}
 					}
 				} else {
-					if ( getenv( 'TERM' ) ) {
-						$columns = (int) exec( '/usr/bin/env tput cols' );
+					if ( ! ( $columns = (int) getenv( 'COLUMNS' ) ) ) {
+						if ( getenv( 'TERM' ) ) {
+							$columns = (int) exec( '/usr/bin/env tput cols 2>/dev/null' );
+						}
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,10 @@ static public function columns() {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`} else {`
`52`		`- if ( getenv( 'TERM' ) ) {`
`53`		`- $columns = (int) exec( '/usr/bin/env tput cols' );`
	`52`	`+ if ( ! ( $columns = (int) getenv( 'COLUMNS' ) ) ) {`
	`53`	`+ if ( getenv( 'TERM' ) ) {`
	`54`	`+ $columns = (int) exec( '/usr/bin/env tput cols 2>/dev/null' );`
	`55`	`+ }`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`