Merge pull request #113 from wp-cli/issue_112

Suppress tput stderr. Use COLUMNS env var 1st if available.
wp-cli · Jul 26, 2017 · c5f9c03 · c5f9c03
2 parents 2d2b582 + 105bc96
commit c5f9c03
Showing 1 changed file with 4 additions and 2 deletions.
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' );
+						}
 					}
 				}
 			}