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

Reorder one of the new features based on experience. Since the number

Browse Source 
of files auto-installed during an upgrade from a really old system
can get quite long, and it's piped to the PAGER already, print
that first, then print any of the 4 two-line messages that might
apply.
This commit is contained in:
Doug Barton 2000-11-01 07:21:56 +00:00
parent 5558b041c8
commit bc21bd54d0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=68153
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.sbin/mergemaster/mergemaster.sh
View File

@ -754,6 +754,18 @@ case "${AUTO_RUN}" in
*) ;;
esac
case "${AUTO_INSTALLED_FILES}" in
'') ;;
*)
(
echo ''
echo '*** You chose the automatic install option for files that did not exist'
echo ' on your system. The following files were installed for you:'
echo "${AUTO_INSTALLED_FILES}"
) | ${PAGER}
;;
esac
case "${NEED_MAKEDEV}" in
'') ;;
*)
@ -790,18 +802,6 @@ case "${NEED_PWD_MKDB}" in
;;
esac
case "${AUTO_INSTALLED_FILES}" in
'') ;;
*)
(
echo ''
echo '*** You chose the automatic install option for files that did not exist'
echo ' on your system. The following files were installed for you:'
echo "${AUTO_INSTALLED_FILES}"
) | ${PAGER}
;;
esac
echo ''
if [ -r "${MM_EXIT_SCRIPT}" ]; then