--- trunk/mage/usr/lib/mage/smage2.sh 2006/03/22 17:45:49 351 +++ trunk/mage/usr/lib/mage/smage2.sh 2006/07/17 20:52:38 386 @@ -4,7 +4,7 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.44 2006-07-17 20:52:38 niro Exp $ #01.10.2004 # added ccache support @@ -91,28 +91,13 @@ local i for i in ${SMAGE2RSYNC} do - rsync \ - --recursive \ - --links \ - --perms \ - --times \ - --devices \ - --timeout=600 \ - --verbose \ - --compress \ - --progress \ - --stats \ - --delete \ - --delete-after \ - ${i} ${SMAGESCRIPTSDIR} - + rsync ${RSYNC_FETCH_OPTIONS} ${i} ${SMAGESCRIPTSDIR} if [[ $? = 0 ]] then break else continue fi - done # clean up backup files (foo~) @@ -362,6 +347,7 @@ PATCHOPTS=$1 PATCHFILE=$2 + echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}" patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE} } @@ -546,7 +532,7 @@ > ${dest} # header - echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.42 2006-03-22 17:45:49 niro Exp $' >> ${dest} + echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.44 2006-07-17 20:52:38 niro Exp $' >> ${dest} echo >> ${dest} # pgkname and state