mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-01 05:16:05 +01:00
zsh-workers/7707
This commit is contained in:
parent
d14fab7bd7
commit
b4958a1a60
2 changed files with 20 additions and 16 deletions
|
@ -1,10 +1,12 @@
|
|||
#!/bin/sh
|
||||
|
||||
if test -d $DESTDIR$fndir.old; then
|
||||
fndir=$DESTDIR$fndir
|
||||
|
||||
if test -d $fndir.old; then
|
||||
add_old=1
|
||||
fi
|
||||
|
||||
$sdir_top/mkinstalldirs $DESTDIR$fndir || exit 1;
|
||||
$sdir_top/mkinstalldirs $fndir || exit 1;
|
||||
|
||||
# If the source directory is somewhere else, we need to force
|
||||
# the shell to expand it in that directory, then strip it off.
|
||||
|
@ -22,17 +24,17 @@ for file in $install; do
|
|||
if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
|
||||
subfile="$file"
|
||||
subdir="`echo $file | sed -e 's%/[^/]*$%%'`"
|
||||
olddir="$DESTDIR$fndir.old/$subdir"
|
||||
instdir="$DESTDIR$fndir/$subdir"
|
||||
olddir="$fndir.old/$subdir"
|
||||
instdir="$fndir/$subdir"
|
||||
else
|
||||
subfile="`echo $file | sed -e 's%^.*/%%'`"
|
||||
olddir="$DESTDIR$fndir.old"
|
||||
instdir="$DESTDIR$fndir"
|
||||
olddir="$fndir.old"
|
||||
instdir="$fndir"
|
||||
fi
|
||||
if test -f $DESTDIR$fndir/$subfile; then
|
||||
if cmp $DESTDIR$fndir/$subfile $sdir/$file >/dev/null; then :; else
|
||||
if test -f $fndir/$subfile; then
|
||||
if cmp $fndir/$subfile $sdir/$file >/dev/null; then :; else
|
||||
$sdir_top/mkinstalldirs $olddir
|
||||
mv $DESTDIR$fndir/$subfile $olddir
|
||||
mv $fndir/$subfile $olddir
|
||||
: ${add_old:=1}
|
||||
fi
|
||||
fi
|
||||
|
@ -42,7 +44,7 @@ for file in $install; do
|
|||
done
|
||||
|
||||
if test x$add_old != x1; then
|
||||
rm -rf $DESTDIR$fndir.old
|
||||
rm -rf $fndir.old
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -11,18 +11,20 @@ for file in $FUNCTIONS_INSTALL; do
|
|||
fi
|
||||
done
|
||||
|
||||
fndir=$DESTDIR$fndir
|
||||
|
||||
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 $DESTDIR$fndir/$file;
|
||||
if test -f $DESTDIR$fndir.old/$file; then
|
||||
mv $DESTDIR$fndir.old/$file $DESTDIR$fndir/$file
|
||||
rm -f $fndir/$file;
|
||||
if test -f $fndir.old/$file; then
|
||||
mv $fndir.old/$file $fndir/$file
|
||||
fi
|
||||
else
|
||||
bfile="`echo $file | sed -e 's%^.*/%%'`"
|
||||
rm -f "$DESTDIR$fndir/$bfile"; \
|
||||
if test -f $DESTDIR$fndir.old/$bfile; then
|
||||
mv $DESTDIR$fndir.old/$bfile $DESTDIR$fndir/$bfile
|
||||
rm -f "$fndir/$bfile"; \
|
||||
if test -f $fndir.old/$bfile; then
|
||||
mv $fndir.old/$bfile $fndir/$bfile
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue