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

MFC r343407: freebsd-update: open $PAGER only if necessary

Browse Source 
PR:		194547, 208497
Submitted by:   Gerald Aryeetey <aryeeteygerald_rogers.com>
Reviewed by:	delphij
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2019-03-05 18:20:16 +00:00
parent 150fc99c77
commit f3d7717ef5
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1921,13 +1921,11 @@ fetch_create_manifest () {
# Report to the user if any updates were avoided due to local changes
if [ -s modifiedfiles ]; then
echo
echo -n "The following files are affected by updates, "
echo "but no changes have"
echo -n "been downloaded because the files have been "
echo "modified locally:"
cat modifiedfiles
fi | $PAGER
cat - modifiedfiles <<- EOF | ${PAGER}
The folling files are affected by updates but no changes have
been downloaded because the files have been modified locally:
EOF
fi
rm modifiedfiles
# If no files will be updated, tell the user and exit
@ -1953,30 +1951,29 @@ fetch_create_manifest () {
# Report removed files, if any
if [ -s files.removed ]; then
echo
echo -n "The following files will be removed "
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.removed
fi | $PAGER
cat - files.removed <<- EOF | ${PAGER}
The following files will be removed as part of updating to
${RELNUM}-p${RELPATCHNUM}:
EOF
fi
rm files.removed
# Report added files, if any
if [ -s files.added ]; then
echo
echo -n "The following files will be added "
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.added
fi | $PAGER
cat - files.added <<- EOF | ${PAGER}
The following files will be added as part of updating to
${RELNUM}-p${RELPATCHNUM}:
EOF
fi
rm files.added
# Report updated files, if any
if [ -s files.updated ]; then
echo
echo -n "The following files will be updated "
echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
cat files.updated
fi | $PAGER
cat - files.updated <<- EOF | ${PAGER}
The following files will be updated as part of updating to
${RELNUM}-p${RELPATCHNUM}:
EOF
fi
rm files.updated
# Create a directory for the install manifest.