Date: Sat, 19 Dec 2009 01:32:34 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r200701 - head/usr.sbin/mergemaster Message-ID: <200912190132.nBJ1WYWU014598@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Dec 19 01:32:34 2009 New Revision: 200701 URL: http://svn.freebsd.org/changeset/base/200701 Log: Fix an indentation issue, no functional changes Modified: head/usr.sbin/mergemaster/mergemaster.sh Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Sat Dec 19 01:30:45 2009 (r200700) +++ head/usr.sbin/mergemaster/mergemaster.sh Sat Dec 19 01:32:34 2009 (r200701) @@ -840,33 +840,33 @@ mm_install () { DONT_INSTALL=yes ;; /.cshrc | /.profile) - case "${AUTO_INSTALL}" in - '') - case "${LINK_EXPLAINED}" in + case "${AUTO_INSTALL}" in '') - echo " *** Historically BSD derived systems have had a" - echo " hard link from /.cshrc and /.profile to" - echo " their namesakes in /root. Please indicate" - echo " your preference below for bringing your" - echo " installed files up to date." + case "${LINK_EXPLAINED}" in + '') + echo " *** Historically BSD derived systems have had a" + echo " hard link from /.cshrc and /.profile to" + echo " their namesakes in /root. Please indicate" + echo " your preference below for bringing your" + echo " installed files up to date." + echo '' + LINK_EXPLAINED=yes + ;; + esac + + echo " Use 'd' to delete the temporary ${COMPFILE}" + echo " Use 'l' to delete the existing ${DESTDIR}${COMPFILE#.} and create the link" + echo '' + echo " Default is to leave the temporary file to deal with by hand" echo '' - LINK_EXPLAINED=yes + echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " + read HANDLE_LINK + ;; + *) # Part of AUTO_INSTALL + HANDLE_LINK=l ;; esac - echo " Use 'd' to delete the temporary ${COMPFILE}" - echo " Use 'l' to delete the existing ${DESTDIR}${COMPFILE#.} and create the link" - echo '' - echo " Default is to leave the temporary file to deal with by hand" - echo '' - echo -n " How should I handle ${COMPFILE}? [Leave it to install later] " - read HANDLE_LINK - ;; - *) # Part of AUTO_INSTALL - HANDLE_LINK=l - ;; - esac - case "${HANDLE_LINK}" in [dD]*) rm "${COMPFILE}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912190132.nBJ1WYWU014598>