Author: gordon
Date: Mon Jan 24 04:32:59 2011
New Revision: 217767
URL: http://svn.freebsd.org/changeset/base/217767
Log:
Honor $PAGER instead of always calling more.
Approved by: colin@
MFC after: 1 week
Modified:
head/usr.sbin/freebsd-update/freebsd-update.sh
Modified: head/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- head/usr.sbin/freebsd-update/freebsd-update.sh Mon Jan 24 00:01:06
2011 (r217766)
+++ head/usr.sbin/freebsd-update/freebsd-update.sh Mon Jan 24 04:32:59
2011 (r217767)
@@ -1875,7 +1875,7 @@ fetch_create_manifest () {
echo -n "been downloaded because the files have been "
echo "modified locally:"
cat modifiedfiles
- fi | more
+ fi | $PAGER
rm modifiedfiles
# If no files will be updated, tell the user and exit
@@ -1905,7 +1905,7 @@ fetch_create_manifest () {
echo -n "The following files will be removed "
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.removed
- fi | more
+ fi | $PAGER
rm files.removed
# Report added files, if any
@@ -1914,7 +1914,7 @@ fetch_create_manifest () {
echo -n "The following files will be added "
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.added
- fi | more
+ fi | $PAGER
rm files.added
# Report updated files, if any
@@ -1924,7 +1924,7 @@ fetch_create_manifest () {
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.updated
- fi | more
+ fi | $PAGER
rm files.updated
# Create a directory for the install manifest.
@@ -3202,6 +3202,11 @@ cmd_IDS () {
# Make sure we find utilities from the base system
export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH}
+# Set a pager if the user doesn't
+if [ -z "$PAGER" ]; then
+ PAGER=/usr/bin/more
+fi
+
# Set LC_ALL in order to avoid problems with character ranges like [A-Z].
export LC_ALL=C
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
