[packages/crossnacl-gcc] - update for omahaproxy changes

glen glen at pld-linux.org
Fri Dec 7 11:20:58 CET 2012


commit 1d2833757b6ef76c5832e0440b09fa9ff1fc8aad
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Dec 7 12:19:52 2012 +0200

    - update for omahaproxy changes

 get-source.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/get-source.sh b/get-source.sh
index 500923c..ac2584d 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -24,13 +24,12 @@ specfile=crossnacl-gcc.spec
 depth=5
 
 chrome_channel=${1:-stable}
-chrome_version=$(curl -s "$omahaproxy_url/?os=linux&channel=$chrome_channel" | awk -F, 'NR > 1{print $3}')
+chrome_version=$(curl -s "$omahaproxy_url/all?os=linux&channel=$chrome_channel" | awk -F, 'NR > 1{print $3}')
 test -n "$chrome_version"
-chrome_revision=$(curl -s $omahaproxy_url/revision?version=$chrome_version)
+chrome_revision=$((echo 'data='; curl -s $omahaproxy_url/revision.json?version=$chrome_version; echo ',print(data.chromium_revision)') | js)
 test -n "$chrome_revision"
 chrome_branch=$(IFS=.; set -- $chrome_version; echo $3)
-
-test -e DEPS.py || svn cat http://src.chromium.org/chrome/branches/$chrome_branch/src/DEPS@$chrome_revision > DEPS.py
+test -s DEPS.py || svn cat http://src.chromium.org/chrome/branches/$chrome_branch/src/DEPS@$chrome_revision > DEPS.py
 nacl_revision=$(awk -F'"' '/nacl_revision.:/{print $4}' DEPS.py)
 test -n "$nacl_revision"
 
@@ -47,7 +46,7 @@ fi
 
 # get src/native_client/tools/REVISIONS directly from svn
 test -n "$nacl_revision"
-test -e NACL_REVISIONS.sh || svn cat $nacl_trunk/src/native_client/tools/REVISIONS@$nacl_revision > NACL_REVISIONS.sh
+test -s NACL_REVISIONS.sh || svn cat $nacl_trunk/src/native_client/tools/REVISIONS@$nacl_revision > NACL_REVISIONS.sh
 
 if grep -Ev '^(#|(LINUX_HEADERS_FOR_NACL|NACL_(BINUTILS|GCC|GDB|GLIBC|NEWLIB))_COMMIT=[0-9a-f]+$|)' NACL_REVISIONS.sh >&2; then
 	echo >&2 "I refuse to execute grabbed file for security concerns"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossnacl-gcc.git/commitdiff/1d2833757b6ef76c5832e0440b09fa9ff1fc8aad



More information about the pld-cvs-commit mailing list