new
parent
f3dad74848
commit
266258b79c
|
@ -23,7 +23,7 @@ fi
|
|||
|
||||
echo "================ Identifying Patches For CTYPE Postgres ===================";
|
||||
cd $MAYBMSDIR
|
||||
for i in $(find $PIPDIR/src/patch -type f | grep -v CVS | grep -v '.original' | sed "s:^$PIPDIR/src/patch/::"); do
|
||||
for i in $(find $PIPDIR/src/patch -type f | grep -v CVS | grep -v '.original' | sed "s:^$PIPDIR/src/patch/::"); do
|
||||
if [ -f $CTYPEDIR/src/$i ] ; then
|
||||
if diff -q $PIPDIR/src/patch/$i $CTYPEDIR/src/$i > /dev/null ; then
|
||||
echo "Ignoring up-to-date file $i";
|
||||
|
@ -31,15 +31,15 @@ for i in $(find $PIPDIR/src/patch -type f | grep -v CVS | grep -v '.original' |
|
|||
if [ ! -f $PIPDIR/src/patch/$i.original ] ; then
|
||||
echo "Replacing file $i";
|
||||
cp $PIPDIR/src/patch/$i $CTYPEDIR/src/$i
|
||||
else
|
||||
else
|
||||
echo "Patching file $i";
|
||||
merge $CTYPEDIR/src/$i $PIPDIR/src/patch/$i.original $PIPDIR/src/patch/$i
|
||||
fi
|
||||
fi
|
||||
else
|
||||
else
|
||||
echo "Copying new file $i";
|
||||
cp $PIPDIR/src/patch/$i $CTYPEDIR/src/$i;
|
||||
fi
|
||||
done
|
||||
|
||||
cd $ORIGINALWD
|
||||
cd $ORIGINALWD
|
||||
|
|
Loading…
Reference in New Issue