summaryrefslogtreecommitdiff
path: root/source/a/pkgtools/scripts
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-06-01 21:28:10 +0000
committerEric Hameleers <alien@slackware.com>2018-06-02 12:41:13 +0200
commit49c42264db93dbcfad7b9c15f7cb731627cc4ebc (patch)
tree9f4bbeb53f936de5228d333cfb3b8b98064304a7 /source/a/pkgtools/scripts
parent8c9271e25c83e23cce857e3d79b47280b88a5ec4 (diff)
downloadcurrent-49c42264db93dbcfad7b9c15f7cb731627cc4ebc.tar.gz
Fri Jun 1 21:28:10 UTC 201820180601212810
a/mcelog-158-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-15.txz: Rebuilt. installpkg, upgradepkg: test tty -s before using tput. Thanks to aaazen. d/cmake-3.11.3-x86_64-1.txz: Upgraded. l/imagemagick-6.9.9_49-x86_64-1.txz: Upgraded. Support OpenMP. This had been disabled years ago due to issues with perl modules, but probably that's been fixed by now. Thanks to olear. l/pygobject3-3.28.3-x86_64-1.txz: Upgraded. x/xf86-input-evdev-2.10.6-x86_64-1.txz: Upgraded. x/xf86-input-synaptics-1.9.1-x86_64-1.txz: Upgraded. xap/fvwm-2.6.8-x86_64-1.txz: Upgraded. extra/xf86-video-fbdev/xf86-video-fbdev-0.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/pkgtools/scripts')
-rw-r--r--source/a/pkgtools/scripts/installpkg2
-rw-r--r--source/a/pkgtools/scripts/upgradepkg2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 453e391e..2b87bf36 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -182,7 +182,7 @@ package_name() {
THREADS="$(nproc)"
# Set default line length for terse mode:
-if which tput 1> /dev/null 2> /dev/null ; then
+if tty -s && which tput 1> /dev/null 2> /dev/null ; then
TERSELENGTH=$(tput cols)
else
TERSELENGTH=80
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index bb150483..1acae7d6 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -119,7 +119,7 @@ if [ ! -d $INSTLOCKDIR ]; then
fi
# Set default line length for terse mode:
-if which tput 1> /dev/null 2> /dev/null ; then
+if tty -s && which tput 1> /dev/null 2> /dev/null ; then
TERSELENGTH=$(tput cols)
else
TERSELENGTH=80