View | Details | Raw Unified | Return to bug 28190
Collapse All | Expand All

(-)mergemaster.sh Sat Jun 16 03:27:18 2001 (-4 / +4 lines)
Lines 471-477 Link Here
471
    echo ' *** Press [Enter] or [Return] key to continue'
471
    echo ' *** Press [Enter] or [Return] key to continue'
472
    read ANY_KEY
472
    read ANY_KEY
473
    unset ANY_KEY
473
    unset ANY_KEY
474
    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in /etc" | ${PAGER}
474
    diff -qr ${DESTDIR}/etc ${TEMPROOT}/etc | grep "^Only in ${DESTDIR}/etc" |
475
    echo ''
475
    echo ''
476
    echo ' *** Press [Enter] or [Return] key to continue'
476
    echo ' *** Press [Enter] or [Return] key to continue'
477
    read ANY_KEY
477
    read ANY_KEY
Lines 592-598 Link Here
592
      NEED_CAP_MKDB=yes
592
      NEED_CAP_MKDB=yes
593
      ;;
593
      ;;
594
    /etc/master.passwd)
594
    /etc/master.passwd)
595
      install -m 600 "${1}" "${DESTDIR}${INSTALL_DIR}" &&
595
      install -c -m 600 "${1}" "${DESTDIR}${INSTALL_DIR}" &&
596
        [ -f "${1}" ] && rm "${1}"
596
        [ -f "${1}" ] && rm "${1}"
597
      NEED_PWD_MKDB=yes
597
      NEED_PWD_MKDB=yes
598
      DONT_INSTALL=yes
598
      DONT_INSTALL=yes
Lines 651-657 Link Here
651
651
652
    case "${DONT_INSTALL}" in
652
    case "${DONT_INSTALL}" in
653
    '')
653
    '')
654
      install -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
654
      install -c -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
655
        [ -f "${1}" ] && rm "${1}"
655
        [ -f "${1}" ] && rm "${1}"
656
      ;;
656
      ;;
657
    *)
657
    *)
Lines 664-670 Link Here
664
      NEED_MAKEDEV=yes
664
      NEED_MAKEDEV=yes
665
      ;;
665
      ;;
666
    esac
666
    esac
667
    install -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
667
    install -c -m "${FILE_MODE}" "${1}" "${DESTDIR}${INSTALL_DIR}" &&
668
      [ -f "${1}" ] && rm "${1}"
668
      [ -f "${1}" ] && rm "${1}"
669
  fi
669
  fi
670
  return $?
670
  return $?

Return to bug 28190