[Synfig-devl] Konstantin Dmitriev : Invoke bash directly to detect revision ( allows to avoid using some minimal shell alternatives). Minor improvements on branch detection.

[Konstantin Dmitriev]

Module: synfig
Branch: zelgadis_master
Commit: 2e16825821373ef132e3601f9fcc8da63eb61848
URL:    
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=2e16825821373ef132e3601f9fcc8da63eb61848

Author: Konstantin Dmitriev <ksee.zelga...@gmail.com>
Date:   Thu Jul 23 04:37:29 2009 +0700

Invoke bash directly to detect revision (allows to avoid using some minimal 
shell alternatives). Minor improvements on branch detection.

---

 synfig-core/trunk/build_tools/Makefile.am       |    2 +-
 synfig-core/trunk/build_tools/autorevision.sh   |    2 +-
 synfig-studio/trunk/build_tools/Makefile.am     |    2 +-
 synfig-studio/trunk/build_tools/autorevision.sh |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-core/trunk/build_tools/Makefile.am 
b/synfig-core/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-core/trunk/build_tools/Makefile.am
+++ b/synfig-core/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-       sh $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
+       bash $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
 
 clean-local:
        -rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-core/trunk/build_tools/autorevision.sh 
b/synfig-core/trunk/build_tools/autorevision.sh
index f898b10..3b14c59 100644
--- a/synfig-core/trunk/build_tools/autorevision.sh
+++ b/synfig-core/trunk/build_tools/autorevision.sh
@@ -16,7 +16,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 BRANCH=`cd "$1"; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+       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
                BRANCH='master'
diff --git a/synfig-studio/trunk/build_tools/Makefile.am 
b/synfig-studio/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-studio/trunk/build_tools/Makefile.am
+++ b/synfig-studio/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-       sh $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
+       bash $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
 
 clean-local:
        -rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-studio/trunk/build_tools/autorevision.sh 
b/synfig-studio/trunk/build_tools/autorevision.sh
index e6516b1..f60f4ef 100644
--- a/synfig-studio/trunk/build_tools/autorevision.sh
+++ b/synfig-studio/trunk/build_tools/autorevision.sh
@@ -16,7 +16,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 BRANCH=`cd "$1"; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+       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
                BRANCH='master'


------------------------------------------------------------------------------
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl