diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:58:21 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-02-15 20:58:43 +0200 |
commit | 95f861f2af6858412445371c621ebd1a00e16f81 (patch) | |
tree | 59978df025ad96986781863e94e600e280a9f0a7 | |
parent | 19de5926253c0b5a060997dbc0f33711336adfeb (diff) | |
download | slackupgrade-95f861f2af6858412445371c621ebd1a00e16f81.tar.gz slackupgrade-95f861f2af6858412445371c621ebd1a00e16f81.tar.bz2 |
Use tput or stty to get the terminal size
-rw-r--r-- | slackupgrade | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slackupgrade b/slackupgrade index e4335a0..9be3e98 100644 --- a/slackupgrade +++ b/slackupgrade | |||
@@ -383,12 +383,13 @@ function disk_avail_size() { | |||
383 | # Downloads all selected packages to the spool directory. | 383 | # Downloads all selected packages to the spool directory. |
384 | function download_all() { | 384 | function download_all() { |
385 | info "downloading packages" | 385 | info "downloading packages" |
386 | if [ ${COLUMNS:-0} -lt 10 ]; then | 386 | cols=$(tput cols 2>/dev/null || stty size 2>/dev/null | cut -d' ' -f2) |
387 | if [ ${cols:-0} -lt 10 ]; then | ||
387 | progressbar=0 | 388 | progressbar=0 |
388 | fi | 389 | fi |
389 | if [ $progressbar -eq 1 ]; then | 390 | if [ $progressbar -eq 1 ]; then |
390 | total=$(wc -l candidates | cut -d ' ' -f 1) | 391 | total=$(wc -l candidates | cut -d ' ' -f 1) |
391 | width=$(( $COLUMNS - 7 )) | 392 | width=$(( $cols - 7 )) |
392 | fi | 393 | fi |
393 | i=0 | 394 | i=0 |
394 | cat candidates | | 395 | cat candidates | |