diff options
| author | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-28 18:44:40 +0000 |
|---|---|---|
| committer | Matthew Dillon <dillon@FreeBSD.org> | 2003-01-28 18:44:40 +0000 |
| commit | f959d237889c23cf709e1981c53a2ab62495a81a (patch) | |
| tree | 639a274067e358aca7d7192ef9345eca6a73ada7 /usr.sbin | |
| parent | 627e7962d978d0054e3480fc82097640068adf91 (diff) | |
| download | src-test2-f959d237889c23cf709e1981c53a2ab62495a81a.tar.gz src-test2-f959d237889c23cf709e1981c53a2ab62495a81a.zip | |
Notes
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 55 |
1 files changed, 11 insertions, 44 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 5b20b059652b..d2f1f905e102 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -12,30 +12,6 @@ PATH=/bin:/usr/bin:/usr/sbin -# Figure out the number of columns and rows on the -# terminal. Use 80x24 if there is any doubt. -# -if test -t 0; then - DIFFROWS=`stty size | awk '{ print $1; }'` - DIFFCOLS=`stty size | awk '{ print $2; }'` - if [ -z "$DIFFCOLS" ]; then - DIFFCOLS=80 - fi - if [ -z "$DIFFROWS" ]; then - DIFFROWS=24 - fi - if [ $DIFFROWS -le 0 ]; then - DIFFROWS=24 - fi - if [ $DIFFCOLS -le 0 ]; then - DIFFCOLS=80 - fi -else - DIFFCOLS=80 - DIFFROWS=24 -fi -DIFFROWS=$(($DIFFROWS - 8)) -DIFFCOLS=$(($DIFFCOLS - 1)) display_usage () { VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4` echo "mergemaster version ${VERSION_NUMBER}" @@ -130,33 +106,24 @@ merge_loop () { diff_loop () { HANDLE_COMPFILE=v - FIRST_TIME=y while [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" -o \ "${HANDLE_COMPFILE}" = "NOT V" ]; do if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then - if [ "$FIRST_TIME" = "y" ]; then - clear - ( - echo " *** Displaying differences between ${COMPFILE} and installed version:" - echo '' - diff "${DIFF_FLAG}" "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" - ) | cut -b 1-${DIFFCOLS} | head -${DIFFROWS} - echo '...' - else - clear - ( - echo " *** Displaying differences between ${COMPFILE} and installed version:" - echo '' - diff "${DIFF_FLAG}" "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" - ) | ${PAGER} - fi echo '' - FIRST_TIME=n + echo ' ====================================================================== ' + echo '' + ( + echo '' + echo " *** Displaying differences between ${COMPFILE} and installed version:" + echo '' + diff "${DIFF_FLAG}" "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" + ) | ${PAGER} + echo '' fi else - clear + echo '' echo " *** There is no installed version of ${COMPFILE}" echo '' case "${AUTO_INSTALL}" in @@ -184,7 +151,7 @@ diff_loop () { case "${NO_INSTALLED}" in '') echo " Use 'm' to merge the temporary and installed versions" - echo " Use 'v' to view the entire diff results" + echo " Use 'v' to view the diff results again" ;; esac echo '' |