Author: glen Date: Sun Aug 28 20:06:27 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add @COPYSOURCES@ for adobe install
---- Files affected:
SOURCES:
license-installer.sh (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/license-installer.sh
diff -u SOURCES/license-installer.sh:1.4 SOURCES/license-installer.sh:1.5
--- SOURCES/license-installer.sh:1.4 Sun Aug 28 17:28:44 2005
+++ SOURCES/license-installer.sh Sun Aug 28 22:06:22 2005
@@ -12,6 +12,14 @@
BACKUP=1
mv -f $SPECDIR/@[EMAIL PROTECTED] $SPECDIR/@[EMAIL PROTECTED]
fi
+ if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+ for i in @COPYSOURCES@; do
+ if [ -f $SOURCEDIR/$i ]; then
+ mv -f $SOURCEDIR/$i $SOURCEDIR/$i.prev
+ BACKUP=1
+ fi
+ done
+ fi
if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
( cd $SRPMDIR
if echo "$3" | grep '://' >/dev/null; then
@@ -20,10 +28,25 @@
cp -f "$3" .
fi
rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @[EMAIL
PROTECTED] )
- )
+ if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+ for i in @COPYSOURCES@; do
+ rpm2cpio $i | ( cd $TMPDIR; cpio -i $i )
+ done
+ fi
+ )
cp -i $TMPDIR/@[EMAIL PROTECTED] $SPECDIR/@[EMAIL PROTECTED] ||
exit 1
+ if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+ for i in @COPYSOURCES@; do
+ cp -i $TMPDIR/$i $SOURCEDIR/$i || exit 1
+ done
+ fi
else
cp -i "$3" $SPECDIR || exit 1
+ if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+ for i in @COPYSOURCES@; do
+ cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1
+ done
+ fi
fi
( cd $SPECDIR
/usr/bin/builder -nm -nc -ncs --with license_agreement --opts [EMAIL
PROTECTED]@ @[EMAIL PROTECTED]
@@ -35,6 +58,14 @@
if [ "$BACKUP" -eq 1 ]; then
if [ -f $SPECDIR/@[EMAIL PROTECTED] ]; then
mv -f $SPECDIR/@[EMAIL PROTECTED] $SPECDIR/@[EMAIL
PROTECTED]
+ fi
+ if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
+ for i in @COPYSOURCES@; do
+ if [ -f $SOURCEDIR/$i ]; then
+ mv -f $SOURCEDIR/$i.prev $SOURCEDIR/$i
+ BACKUP=1
+ fi
+ done
fi
fi
else
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
