Page MenuHomeFreeBSD

D18913.id53058.diff
No OneTemporary

D18913.id53058.diff

Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -1949,13 +1949,15 @@
# 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
+ {
+ 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
+ } | $PAGER
+ fi
rm modifiedfiles
# If no files will be updated, tell the user and exit
@@ -1981,30 +1983,35 @@
# 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
+ {
+ echo
+ echo -n "The following files will be removed "
+ echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
+ cat files.removed
+ } | $PAGER
+ 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
+ {
+ echo
+ echo -n "The following files will be added "
+ echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
+ cat files.added
+ } | $PAGER
+ 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
+ {
+ echo
+ echo -n "The following files will be updated "
+ echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
+ cat files.updated
+ } | $PAGER
+ fi
rm files.updated
# Create a directory for the install manifest.

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 26, 1:17 AM (7 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35507791
Default Alt Text
D18913.id53058.diff (2 KB)

Event Timeline