commit 57c5ccb30fc3c1e017399f3d93aa095359069026
Author: Elan Ruusamäe <[email protected]>
Date: Sat Sep 14 11:52:11 2013 +0300
simplify
update-source.sh | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/update-source.sh b/update-source.sh
index 50c38fa..6a6e75f 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -57,16 +57,17 @@ echo "$ver-$rev"
oldrev=$(awk '/^%define[ ]+svnrev[ ]+/{print $NF}' $specfile)
oldflash=$(awk '/^%define[ ]+flashv[ ]+/{print $NF}' $specfile)
-if [ "$oldrev" != "$rev" -o "$oldflash" != "$flashv" ]; then
- echo "Updating $specfile for $ver r$rev"
- sed -i -e "
- s/^\(%define[ \t]\+svnrev[ \t]\+\)[0-9]\+\$/\1$rev/
- s/^\(%define[ \t]\+state[ \t]\+\)[a-z]\+\$/\1$branch/
- s/^\(%define[ \t]\+flashv[ \t]\+\)[0-9.]\+\$/\1$flashv/
- s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$ver/
- " $specfile
- ../builder -ncs -g $specfile || :
- ../builder -ncs -5 $specfile
-else
+if [ "$oldrev" = "$rev" -a "$oldflash" = "$flashv" ]; then
echo "Already up to date"
+ exit 0
fi
+
+echo "Updating $specfile for $ver r$rev"
+sed -i -e "
+ s/^\(%define[ \t]\+svnrev[ \t]\+\)[0-9]\+\$/\1$rev/
+ s/^\(%define[ \t]\+state[ \t]\+\)[a-z]\+\$/\1$branch/
+ s/^\(%define[ \t]\+flashv[ \t]\+\)[0-9.]\+\$/\1$flashv/
+ s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$ver/
+" $specfile
+../builder -ncs -g $specfile || :
+../builder -ncs -5 $specfile
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/google-chrome.git/commitdiff/57c5ccb30fc3c1e017399f3d93aa095359069026
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
