forked from extern/egroupware
fixed not working update of existing build-root
This commit is contained in:
parent
4f0dd0066b
commit
ebf9609590
@ -18,7 +18,7 @@
|
|||||||
# to
|
# to
|
||||||
# rpmbuild -bb egroupware-rh.spec >> $LOGFILE 2>&1
|
# rpmbuild -bb egroupware-rh.spec >> $LOGFILE 2>&1
|
||||||
#
|
#
|
||||||
# in the sript
|
# in the script
|
||||||
# How to create GPG keys to sign your rpm's you will found in a seperate
|
# How to create GPG keys to sign your rpm's you will found in a seperate
|
||||||
# Document
|
# Document
|
||||||
#
|
#
|
||||||
@ -45,8 +45,9 @@ PACKAGING=`grep "%define packaging" $SPECFILE | cut -f3 -d' '`
|
|||||||
PACKAGINGFEDORA=`grep "Release:" $SPECFILEFEDORA | cut -f2 -d' '`
|
PACKAGINGFEDORA=`grep "Release:" $SPECFILEFEDORA | cut -f2 -d' '`
|
||||||
|
|
||||||
HOMEBUILDDIR=`whoami`
|
HOMEBUILDDIR=`whoami`
|
||||||
CVSACCOUNT=ext:ralfbecker
|
#which account to use for checkouts and updates, after that the tree is made anonymous anyway, to allow users to update
|
||||||
#CVSACCOUNT=pserver:anonymous
|
#CVSACCOUNT=ext:ralfbecker
|
||||||
|
CVSACCOUNT=pserver:anonymous
|
||||||
ANONCVSDIR=/tmp/build_root/egroupware
|
ANONCVSDIR=/tmp/build_root/egroupware
|
||||||
ANONCVSDIRFEDORA=/tmp/build_root/fedora
|
ANONCVSDIRFEDORA=/tmp/build_root/fedora
|
||||||
ANONCVSDIRFEDORABUILD=/tmp/build_root/fedora/egroupware
|
ANONCVSDIRFEDORABUILD=/tmp/build_root/fedora/egroupware
|
||||||
@ -72,22 +73,29 @@ echo "---------------------------------------" >> $LOGFILE 2>&1
|
|||||||
date >> $LOGFILE 2>&1
|
date >> $LOGFILE 2>&1
|
||||||
cd $ANONCVSDIR
|
cd $ANONCVSDIR
|
||||||
|
|
||||||
if [ ! -d egroupware/phpgwapi ] ; then
|
[ "$CVSACCOUNT" = 'pserver:anonymous' ] && cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware login
|
||||||
|
|
||||||
[ $CVSACCOUT = 'pserver:anonymous'] && cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware login
|
if [ ! -d egroupware/phpgwapi ] # new checkout
|
||||||
|
then
|
||||||
cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -r $BRANCH egroupware
|
cvs -z9 -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -Pr $BRANCH egroupware
|
||||||
cd egroupware
|
cd egroupware
|
||||||
cvs -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -r $BRANCH all
|
cvs -z9 -d:$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware co -Pr $BRANCH all
|
||||||
|
else # updating an existing checkout in the build-root
|
||||||
|
[ "$CVSACCOUNT" != 'pserver:anonymous' ] && { # changing back to the developer account
|
||||||
|
echo ":$CVSACCOUNT@cvs.sourceforge.net:/cvsroot/egroupware" > Root.developer
|
||||||
|
find . -name CVS -exec cp Root.developer {}/Root \;
|
||||||
|
rm Root.developer
|
||||||
|
}
|
||||||
|
cd egroupware # need to step into the eGW dir (no CVS dir otherwise)
|
||||||
|
cvs -z9 update -r $BRANCH -dP >> $LOGFILE 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $ANONCVSDIR
|
cd $ANONCVSDIR
|
||||||
|
|
||||||
cvs -z9 update -r $BRANCH -dP >> $LOGFILE 2>&1
|
|
||||||
|
|
||||||
echo ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/egroupware" > Root.anonymous
|
echo ":pserver:anonymous@cvs.sourceforge.net:/cvsroot/egroupware" > Root.anonymous
|
||||||
find . -type d -name CVS -exec cp Root.anonymous {}/Root \; >> $LOGFILE 2>&1
|
find . -name CVS -exec cp Root.anonymous {}/Root \; >> $LOGFILE 2>&1
|
||||||
rm Root.anonymous
|
rm Root.anonymous
|
||||||
|
|
||||||
echo "End from CVS update" >> $LOGFILE 2>&1
|
echo "End from CVS update" >> $LOGFILE 2>&1
|
||||||
echo "---------------------------------------" >> $LOGFILE 2>&1
|
echo "---------------------------------------" >> $LOGFILE 2>&1
|
||||||
find . -type d -exec chmod 775 {} \;
|
find . -type d -exec chmod 775 {} \;
|
||||||
|
Loading…
Reference in New Issue
Block a user