Author: glen Date: Fri Feb 18 23:31:27 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- lessen indent
---- Files affected:
packages/chromium-browser:
update-source.sh (1.19 -> 1.20)
---- Diffs:
================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.19
packages/chromium-browser/update-source.sh:1.20
--- packages/chromium-browser/update-source.sh:1.19 Sat Feb 19 00:30:33 2011
+++ packages/chromium-browser/update-source.sh Sat Feb 19 00:31:22 2011
@@ -75,49 +75,51 @@
../builder -ncs -5 $specfile
-if [ "$build_package" != 0 ]; then
- dist=$(rpm -E %{pld_release})
- arch=$(rpm -E %{_host_cpu})
- outdir=$(readlink -f $dir)/build-$dist-$arch
- logfile=$outdir/$pkg.log
- rpmdir=$outdir/RPMS
- install -d $rpmdir
+if [ "$build_package" = 0 ]; then
+ exit 0
+fi
- # setup custom logfile via $HOME_ETC hack
- # TODO: just add --logfile support for builder
- cat > $outdir/.builderrc <<-EOF
- if [ -n "$HOME_ETC" ]; then
- . "$HOME_ETC/.builderrc"
- elif [ -r ~/.builderrc ]; then
- . ~/.builderrc
- fi
- LOGFILE='$logfile'
- EOF
+dist=$(rpm -E %{pld_release})
+arch=$(rpm -E %{_host_cpu})
+outdir=$(readlink -f $dir)/build-$dist-$arch
+logfile=$outdir/$pkg.log
+rpmdir=$outdir/RPMS
+install -d $rpmdir
- > $logfile
- HOME_ETC=$outdir \
- ../builder -bb --clean \
- --define "_unpackaged_files_terminate_build 1" \
- --define '_enable_debug_packages 0' \
- --define "_builddir $outdir" \
- --define "_rpmdir $rpmdir" \
- $specfile || {
- echo "Package build failed"
- tail -n 1000 $logfile >&2
- exit 1
- }
+# setup custom logfile via $HOME_ETC hack
+# TODO: just add --logfile support for builder
+cat > $outdir/.builderrc <<-EOF
+ if [ -n "$HOME_ETC" ]; then
+ . "$HOME_ETC/.builderrc"
+ elif [ -r ~/.builderrc ]; then
+ . ~/.builderrc
+ fi
+ LOGFILE='$logfile'
+EOF
- rpmdest=~/public_html/chromium-browser/$dist/$arch/
- if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ];
then
- install -d $rpmdest
- umask 022
- chmod 644 $rpmdir/*.rpm
- mv -v $rpmdir/*.rpm $rpmdest/
- poldek --cachedir=$HOME/tmp --mkidx -s $rpmdest/ --mt=pndir
+> $logfile
+HOME_ETC=$outdir \
+ ../builder -bb --clean \
+ --define "_unpackaged_files_terminate_build 1" \
+ --define '_enable_debug_packages 0' \
+ --define "_builddir $outdir" \
+ --define "_rpmdir $rpmdir" \
+ $specfile || {
+ echo "Package build failed"
+ tail -n 1000 $logfile >&2
+ exit 1
+}
- if [ -x /usr/bin/createrepo ]; then
- install -d $rpmdest/repodata/cache
- createrepo -q -c $rpmdest/repodata/cache $rpmdest
- fi
+rpmdest=~/public_html/chromium-browser/$dist/$arch/
+if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ]; then
+ install -d $rpmdest
+ umask 022
+ chmod 644 $rpmdir/*.rpm
+ mv -v $rpmdir/*.rpm $rpmdest/
+ poldek --cachedir=$HOME/tmp --mkidx -s $rpmdest/ --mt=pndir
+
+ if [ -x /usr/bin/createrepo ]; then
+ install -d $rpmdest/repodata/cache
+ createrepo -q -c $rpmdest/repodata/cache $rpmdest
fi
fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
