From d5722157dc8c949a9246ca809387b1f660cfcfb9 Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov Date: Tue, 29 Apr 2008 14:03:49 +0400 Subject: [PATCH] add VERSION, etersoft_version updating --- etersoft/update_branches.sh | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/etersoft/update_branches.sh b/etersoft/update_branches.sh index 1ea8ab34eb..91355e9dbd 100755 --- a/etersoft/update_branches.sh +++ b/etersoft/update_branches.sh @@ -1,16 +1,43 @@ #!/bin/sh -# Only for -# Updates all our branches from winehq -[ "$USER" = "lav" ] || exit 1 +VERSION=`date -d today "+%Y%m%d"` +ETERVERSION=1.0.9 +CURBRANCH=eter-$ETERVERSION # parent dir is not missed in pure cd .. + +if [ "$USER" != "lav" ] ; then + # for first time + git checkout -b $CURBRANCH origin/$CURBRANCH + git checkout -b pure origin/pure + git checkout master + git pull origin master + git checkout -b eterhack origin/eterhack + + # Update from origin + git checkout $CURBRANCH + git pull origin $CURBRANCH + git checkout pure + git pull origin pure + git checkout master + git pull origin master + git checkout eterhack + git pull origin eterhack + exit 0 +fi + + +# Updates all our branches from winehq # in one line git checkout pure && git pull --tags origin master && git checkout master || exit 1 git merge pure || exit 1 git checkout eterhack || exit 1 git merge master || exit 1 +echo "WINE@Etersoft version $ETERVERSION" > VERSION +subst "s|WINEVERSION [0-9].*|WINEVERSION $VERSION|g" libs/wine/config.c +git commit VERSION -m "Update eterversion" +git commit libs/wine/config.c -m "Update source version" # return to current branch git checkout master || exit 1 echo "All done correctly" -- 2.33.8