- addons to last commit

[packages/chromium-browser-bin.git] / update-source.sh

diff --git a/update-source.sh b/update-source.sh
index 05b0959754477973aa4946196b327dd30495cbee..f33aa54839bc9b896495b67dc05e3d1de769df9c 100644 (file)
--- a/update-source.sh
+++ b/update-source.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 if [ "$1" ]; then
        rev=$1
@@ -9,13 +10,13 @@ else
        echo "$rev"
 fi
 
-if [ ! -f chromium-linux32-r$rev.zip ]; then
-       wget http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/$rev/chrome-linux.zip -c -O chromium-linux32-r$rev.zip
-       upload_32="chromium-linux32-r$rev.zip"
+if [ ! -f chromium-browser32-r$rev.zip ]; then
+       wget http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/$rev/chrome-linux.zip -c -O chromium-browser32-r$rev.zip
+       upload_32="chromium-browser32-r$rev.zip"
 fi
-if [ ! -f chromium-linux64-r$rev.zip ]; then
-       wget http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/$rev/chrome-linux.zip -c -O chromium-linux64-r$rev.zip
-       upload_64="chromium-linux64-r$rev.zip"
+if [ ! -f chromium-browser64-r$rev.zip ]; then
+       wget http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/$rev/chrome-linux.zip -c -O chromium-browser64-r$rev.zip
+       upload_64="chromium-browser64-r$rev.zip"
 fi
 
 if [ -x ./dropin ]; then
@@ -24,7 +25,27 @@ elif [ -x ../dropin ]; then
        dropin=../dropin
 fi
 
-if [ "$dropin" ] && [ "$upload_32" -o "$upload_64" ]; then
+if [ "$upload_32" -o "$upload_64" ]; then
        echo "Uploading to dropin. ^C to abort"
-       $dropin $upload_32 $upload_64
+       ../dropin $upload_32 $upload_64
+fi
+
+specfile=chromium-browser-bin.spec
+oldrev=$(awk '/^%define[       ]+svnrev[       ]+/{print $NF}' $specfile)
+if [ "$oldrev" != "$rev" ]; then
+       # revno => VERSION hint by Caleb Maclennan <caleb#alerque.com>
+       wget -q -O VERSION.sh http://src.chromium.org/viewvc/chrome/trunk/src/chrome/VERSION?revision=$rev
+       if grep -Ev '^(MAJOR|MINOR|BUILD|PATCH)=[0-9]+$' VERSION.sh >&2; then
+               echo >&2 "I refuse to execute grabbed file for security concerns"
+               exit 1
+       fi
+       . ./VERSION.sh
+       version=$MAJOR.$MINOR.$BUILD.$PATCH
+
+       echo "Updating $specfile for $version r$rev"
+       sed -i -e "
+               s/^\(%define[ \t]\+svnrev[ \t]\+\)[0-9]\+\$/\1$rev/
+               s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
+       " $specfile
+       ../builder -ncs -5 $specfile
 fi