Skip to content

Force an integer for the return of Shell::columns(). In cases such as a ... #42

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
jlogsdon merged 2 commits into from
Jan 15, 2014
Merged

Force an integer for the return of Shell::columns(). In cases such as a ... #42

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
e6ca270
Force an integer for the return of Shell::columns(). In cases such as…
dllh Jan 14, 2014
7a0ad26
Make sure we have a size >= 0 so that we never get a negative number …
dllh Jan 14, 2014
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: 1 addition & 1 deletion lib/cli/Shell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Shell {
*/
static public function columns() {
if (stripos(PHP_OS, 'indows') === false) {
return exec('/usr/bin/env tput cols');
return (int) exec('/usr/bin/env tput cols');
}
return 80; // default width of cmd window on Windows OS, maybe force using MODE CON COLS=XXX?
}
Expand Down
3 changes: 3 additions & 0 deletions lib/cli/progress/Bar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public function display($finish = false) {

$size = Shell::columns();
$size -= strlen($msg . $timing);
if ( $size < 0 ) {
$size = 0;
}

$bar = str_repeat($this->_bars[0], floor($_percent * $size)) . $this->_bars[1];
// substr is needed to trim off the bar cap at 100%
Expand Down