From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16597 invoked from network); 7 Aug 2001 09:03:20 -0000 Received: from sunsite.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 7 Aug 2001 09:03:20 -0000 Received: (qmail 6740 invoked by alias); 7 Aug 2001 09:03:07 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 15583 Received: (qmail 6729 invoked from network); 7 Aug 2001 09:03:06 -0000 Message-ID: To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: Re: Completion/Zsh/CVS/* incorrectly installed as functions In-reply-to: ""Bart Schaefer""'s message of "Tue, 07 Aug 2001 00:38:41 -0000." <1010807003841.ZM8870@candle.brasslantern.com> Date: Tue, 07 Aug 2001 10:02:34 +0100 From: Peter Stephenson "Bart Schaefer" wrote: > On Aug 6, 6:32pm, Adam Spiers wrote: > } Subject: Completion/Zsh/CVS/* incorrectly installed as functions > } > } I notice that I'm getting three rather suspicious looking > } files called Entries, Root, and Repository appearing in > } $installed/share/zsh/4.1.0-dev-1/functions. > > Hrm. The makefiles are really designed for use with the packaged > tar distributions and don't do any special handling of CVS subdirs. installfns.sh does, however, but only for function-subdirs, which needs changing. Index: Config/installfns.sh =================================================================== RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v retrieving revision 1.8 diff -u -r1.8 installfns.sh --- Config/installfns.sh 2001/05/20 10:59:28 1.8 +++ Config/installfns.sh 2001/08/07 09:01:32 @@ -13,9 +13,11 @@ # (1) the glob got expanded (2) we are not looking at directories. for file in $allfuncs; do if test -f $sdir_top/$file; then + case "$file" in + */CVS/*) continue;; + esac if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then case "$file" in - */CVS/*) continue;; Completion/comp*) subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`" instdir="$fndir/Completion" -- Peter Stephenson Software Engineer CSR Ltd., Unit 300, Science Park, Milton Road, Cambridge, CB4 0XL, UK Tel: +44 (0)1223 392070 ********************************************************************** The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer. **********************************************************************