PATCH: 3.1.6-pws-2: Config/installfns.sh

PATCH: 3.1.6-pws-2: Config/installfns.sh

[Tanaka Akira]

I found that Functions/{Makefile,Makefile.in,README.zftp} are
installed to prefix/share/zsh/functions.

This is caused by pattern matching problem in installfns.sh.
When $sdir is ".", sed script is "s%./%%g". And now "echo $sdir/$file"
generates "./X/*". Therefore, the substituted result by sed is "*" and
it is expanded in Functions subdirectory.

This patch avoids the problem by adding a space as left anchor for
each words. Although it should also quote $sdir, it does not. Because
this works well with current FUNCTIONS_INSTALL.

Index: Config/installfns.sh
===================================================================
RCS file: /projects/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.1.1.4
diff -u -F^( -r1.1.1.4 installfns.sh
--- installfns.sh	1999/08/28 05:10:54	1.1.1.4
+++ installfns.sh	1999/08/30 20:42:38
@@ -13,7 +13,7 @@
   if test -f "$sdir/$file"; then
     install="$install $file"
   else
-    install="$install `echo $sdir/$file | sed -e \"s%$sdir/%%g\"`"
+    install="$install `echo '' $sdir/$file | sed -e \"s% $sdir/%%g\"`"
   fi
 done
 
-- 
Tanaka Akira

Re: PATCH: 3.1.6-pws-2: Config/installfns.sh

[Bart Schaefer]

On Aug 31, 12:54pm, Tanaka Akira wrote:
} Subject: PATCH: 3.1.6-pws-2: Config/installfns.sh
}
} I found that Functions/{Makefile,Makefile.in,README.zftp} are
} installed to prefix/share/zsh/functions.

The uninstallfns.sh script needs the same fix, and needs to have the DESTDIR
references inserted as well.


Index: uninstallfns.sh
===================================================================
@@ -7,22 +7,22 @@
   if test -f "$sdir/$file"; then
     install="$install $file"
   else
-    install="$install `echo $sdir/$file | sed -e \"s%$sdir/%%g\"`"
+    install="$install `echo '' $sdir/$file | sed -e \"s% $sdir/%%g\"`"
   fi
 done
 
 for file in $install; do
   if test -f $sdir/$file; then
     if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
-      rm -f $fndir/$file;
-      if test -f $fndir.old/$file; then
-	mv $fndir.old/$file $fndir/$file
+      rm -f $DESTDIR$fndir/$file;
+      if test -f $DESTDIR$fndir.old/$file; then
+	mv $DESTDIR$fndir.old/$file $DESTDIR$fndir/$file
       fi
     else
       bfile="`echo $file | sed -e 's%^.*/%%'`"
-      rm -f "$fndir/$bfile"; \
-      if test -f $fndir.old/$bfile; then
-        mv $fndir.old/$bfile $fndir/$bfile
+      rm -f "$DESTDIR$fndir/$bfile"; \
+      if test -f $DESTDIR$fndir.old/$bfile; then
+        mv $DESTDIR$fndir.old/$bfile $DESTDIR$fndir/$bfile
       fi
     fi
   fi

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com