View | Details | Raw Unified | Return to bug 194547 | Differences between
and this patch

Collapse All | Expand All

(-)freebsd-update.sh (-23 / +30 lines)
Lines 1869-1881 Link Here
1869
1869
1870
	# Report to the user if any updates were avoided due to local changes
1870
	# Report to the user if any updates were avoided due to local changes
1871
	if [ -s modifiedfiles ]; then
1871
	if [ -s modifiedfiles ]; then
1872
		echo
1872
		{
1873
		echo -n "The following files are affected by updates, "
1873
			echo
1874
		echo "but no changes have"
1874
			echo -n "The following files are affected by updates, "
1875
		echo -n "been downloaded because the files have been "
1875
			echo "but no changes have"
1876
		echo "modified locally:"
1876
			echo -n "been downloaded because the files have been "
1877
		cat modifiedfiles
1877
			echo "modified locally:"
1878
	fi | $PAGER
1878
			cat modifiedfiles
1879
		} | $PAGER
1880
	fi
1879
	rm modifiedfiles
1881
	rm modifiedfiles
1880
1882
1881
	# If no files will be updated, tell the user and exit
1883
	# If no files will be updated, tell the user and exit
Lines 1901-1930 Link Here
1901
1903
1902
	# Report removed files, if any
1904
	# Report removed files, if any
1903
	if [ -s files.removed ]; then
1905
	if [ -s files.removed ]; then
1904
		echo
1906
		{
1905
		echo -n "The following files will be removed "
1907
			echo
1906
		echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1908
			echo -n "The following files will be removed "
1907
		cat files.removed
1909
			echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1908
	fi | $PAGER
1910
			cat files.removed
1911
		} | $PAGER
1912
	fi
1909
	rm files.removed
1913
	rm files.removed
1910
1914
1911
	# Report added files, if any
1915
	# Report added files, if any
1912
	if [ -s files.added ]; then
1916
	if [ -s files.added ]; then
1913
		echo
1917
		{
1914
		echo -n "The following files will be added "
1918
			echo
1915
		echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1919
			echo -n "The following files will be added "
1916
		cat files.added
1920
			echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1917
	fi | $PAGER
1921
			cat files.added
1922
		} | $PAGER
1923
	fi
1918
	rm files.added
1924
	rm files.added
1919
1925
1920
	# Report updated files, if any
1926
	# Report updated files, if any
1921
	if [ -s files.updated ]; then
1927
	if [ -s files.updated ]; then
1922
		echo
1928
		{
1923
		echo -n "The following files will be updated "
1929
			echo
1924
		echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1930
			echo -n "The following files will be updated "
1925
1931
			echo "as part of updating to ${RELNUM}-p${RELPATCHNUM}:"
1926
		cat files.updated
1932
			cat files.updated
1927
	fi | $PAGER
1933
		} | $PAGER
1934
	fi
1928
	rm files.updated
1935
	rm files.updated
1929
1936
1930
	# Create a directory for the install manifest.
1937
	# Create a directory for the install manifest.

Return to bug 194547