Attachment 148575 Details for Bug 194547 – freebsd-update.sh $PAGER patch

[patch] freebsd-update.sh $PAGER patch

freebsd-update.patch (text/plain), 2.06 KB, created by TEUBEL György on 2014-10-23 09:50:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TEUBEL György

Created: 2014-10-23 09:50:26 UTC

Size: 2.06 KB

patch

obsolete

>Index: freebsd-update.sh
>===================================================================
>--- freebsd-update.sh	(revision 273540)
>+++ freebsd-update.sh	(working copy)
>@@ -1869,13 +1869,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
>@@ -1901,30 +1903,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.

Actions: View | Diff

Attachments on bug 194547: 148574 | 148575