d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Honor $PAGER instead of always calling more.

Browse Source 
Approved by:	colin@
MFC after:	1 week
This commit is contained in:
Gordon Tetlow 2011-01-24 04:32:59 +00:00
parent 7be4de2de7
commit 9c990fb2a4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/freebsd-update/freebsd-update.sh
View File

@ -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