packages: chromium-browser-bin/update-source.sh - use omahaproxy params; op...

[glen]

Author: glen                         Date: Mon Jan 23 22:39:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use omahaproxy params; optimize

---- Files affected:
packages/chromium-browser-bin:
   update-source.sh (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/update-source.sh
diff -u packages/chromium-browser-bin/update-source.sh:1.19 packages/chromium-browser-bin/update-source.sh:1.20
--- packages/chromium-browser-bin/update-source.sh:1.19	Mon Jan 23 23:17:53 2012
+++ packages/chromium-browser-bin/update-source.sh	Mon Jan 23 23:39:27 2012
@@ -6,13 +6,14 @@
 #     version number.
 set -e
 dropin=
+specfile=chromium-browser-bin.spec
 
 # Work in package dir
 dir=$(dirname "$0")
 cd "$dir"
 
 if [ "$1" == "spec" ]; then
-	rev=$(grep -e "^%define.*svnrev" chromium-browser-bin.spec | cut -f4)
+	rev=$(awk '/^%define.*svnrev/{print $NF}' $specfile)
 	echo "Using $rev from spec file"
 elif [ "$1" == "trunk" ]; then
 	echo "Fetching latest revno... "
@@ -35,14 +36,15 @@
 	rev=$1
 	echo "Using $rev..."
 else
-	rev=$(wget -q -O - http://omahaproxy.appspot.com | grep '^linux,dev' | cut -d, -f7)
-	version=$(wget -q -O - http://omahaproxy.appspot.com | grep '^linux,dev' | cut -d, -f3)
+	contents=$(wget -q -O - "http://omahaproxy.appspot.com/?os=linux&channel=dev")
+	rev=$(echo "$contents" | awk -F, '/^linux/{print $7}')
+	version=$(echo "$contents" | awk -F, '/^linux/{print $3}')
 	echo "Using devel channel $rev..."
 fi
 
 if [ ! -f chromium-browser32-r$rev.zip ]; then
 	wget http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/$rev/chrome-linux.zip -c -O chromium-browser32-r$rev.zip
-	
+
 	upload_32="chromium-browser32-r$rev.zip"
 fi
 if [ ! -f chromium-browser64-r$rev.zip ]; then
@@ -63,13 +65,12 @@
 	fi
 fi
 
-specfile=chromium-browser-bin.spec
 oldrev=$(awk '/^%define[ 	]+svnrev[ 	]+/{print $NF}' $specfile)
 if [ "$oldrev" != "$rev" ]; then
 	if [ -z "$version" ]; then
 		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 garbled file for security concerns"
+			echo >&2 "I refuse to execute garbled file due security concerns"
 			exit 1
 		fi
 		. ./VERSION.sh
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/update-source.sh?r1=1.19&r2=1.20&f=u