diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-06-08 21:51:26 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-06-08 21:51:26 +0000 |
| commit | 288d254aabceabe87a535a160df21e28c44201ae (patch) | |
| tree | 5daec82fadf69c8f41fa231a9c7eb32977598d36 /usr.sbin/sysmerge | |
| parent | 21e9c1e30f3dac98330125ac1dab9be43886d70c (diff) | |
- enhance output for 80 columns wide terminals
ok pyr@
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 568aad2e984..f55e61711db 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.8 2008/06/01 15:07:00 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.9 2008/06/08 21:51:25 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -77,7 +77,8 @@ do_pre() { do_populate() { - echo "===> Creating and populating temporary root under ${TEMPROOT}" + echo "===> Creating and populating temporary root under" + echo " ${TEMPROOT}" mkdir -p ${TEMPROOT} if [ "${SRCDIR}" ]; then cd ${SRCDIR}/etc @@ -402,9 +403,10 @@ do_post() { find "${TEMPROOT}" -type f -size +0 -exec echo " {}" \; fi if [ "${FILES_IN_BKPDIR}" ]; then - echo "===> Backup of replaced file(s) can be found under ${BKPDIR}" + echo "===> Backup of replaced file(s) can be found under" + echo " ${BKPDIR}" fi - echo "===> When done, ${WRKDIR} and its sub-directories should be removed" + echo "===> When done, ${WRKDIR} and its subdirectories should be removed" else echo "===> Removing ${WRKDIR}" rm -rf "${WRKDIR}" |