From: Konstantin Dmitriev Date: Sun, 9 May 2010 09:26:07 +0000 (+0700) Subject: Use short revision id for "synfig --info" and about dialog. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=fb6e5f95daa50b3b2ac495dda529d28d1553fa29;p=synfig.git Use short revision id for "synfig --info" and about dialog. --- diff --git a/synfig-core/build_tools/autorevision.sh b/synfig-core/build_tools/autorevision.sh index c8f4cf2..e47de2b 100644 --- a/synfig-core/build_tools/autorevision.sh +++ b/synfig-core/build_tools/autorevision.sh @@ -15,7 +15,7 @@ get_git_id(){ export SCM=git - export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' '` + export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6` export BRANCH="`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`" if ( echo $BRANCH | egrep origin/master > /dev/null ); then #give a priority to master branch diff --git a/synfig-studio/build_tools/autorevision.sh b/synfig-studio/build_tools/autorevision.sh index d8a5c8b..517732b 100644 --- a/synfig-studio/build_tools/autorevision.sh +++ b/synfig-studio/build_tools/autorevision.sh @@ -15,7 +15,7 @@ get_git_id(){ export SCM=git - export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' '` + export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -6` export BRANCH="`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`" if ( echo $BRANCH | egrep origin/master > /dev/null ); then #give a priority to master branch