diff options
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 8b38a55d02fa..e7aee6aa16dc 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 |