summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2000-11-01 07:21:56 +0000
committerdougb <dougb@FreeBSD.org>2000-11-01 07:21:56 +0000
commit034a1560930e55f0161fb4614618c1cdd9641c79 (patch)
tree934245f0f45c2f835e87d2e6436639009cc9fc56 /usr.sbin/mergemaster
parent3b24ba06ad71e85791e6b9a7b36f75172a0dfe7f (diff)
downloadFreeBSD-src-034a1560930e55f0161fb4614618c1cdd9641c79.zip
FreeBSD-src-034a1560930e55f0161fb4614618c1cdd9641c79.tar.gz
Reorder one of the new features based on experience. Since the number
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.
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh24
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 8b38a55..e7aee6a 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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
OpenPOWER on IntegriCloud