From: Konstantin Dmitriev <ksee.zelgadis@gmail.com>
Date: Thu, 23 Jul 2009 05:59:05 +0000 (+0700)
Subject: Do not force usage of bash. Made autorevision scripts compatible with bash and dash... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=661598b9d04f04e82982720d835dcb75ac8e11f0;p=synfig.git

Do not force usage of bash. Made autorevision scripts compatible with bash and dash at the same time.
---

diff --git a/synfig-core/trunk/build_tools/Makefile.am b/synfig-core/trunk/build_tools/Makefile.am
index 27edb64..29b053f 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:
-	bash $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
+	sh $(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 3b14c59..b635911 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\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`
+	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'
@@ -24,8 +24,7 @@ get_git_id(){
 		BRANCH=`echo $BRANCH | cut -d ' ' -f 1`
 		BRANCH=${BRANCH#*/}
 	fi
-	export REVISION=`git show --pretty=format:%ci HEAD |  head -c 10`
-	REVISION=${REVISION:0:4}${REVISION:5:2}${REVISION:8:2}
+	export REVISION=`git show --pretty=format:%ci HEAD |  head -c 10 | tr -d '-'`
 	export COMPARE="$1/.git/"
 	# The extra * at the end is for Modified
 	#REVISION="$REVISION"`cd "$1"; [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"`
@@ -94,7 +93,7 @@ if [ x = "x$DEVEL_VERSION" ] ; then
 		elif [ $SCM = git-svn ] ; then
 			DEVEL_VERSION="SVN r$REVISION (via git)"
 		elif [ $SCM = git ] ; then
-			DEVEL_VERSION="Revision: $REVISION\\nBranch: ${BRANCH}\\nRevision ID: $REVISION_ID"
+			DEVEL_VERSION="Revision: ${REVISION}\\\\nBranch: ${BRANCH}\\\\nRevision ID: ${REVISION_ID}"
 		elif [ $SCM = manual ] ; then
 			DEVEL_VERSION="$REVISION (manually configured)"
 		fi
@@ -104,5 +103,5 @@ fi
 
 # Output the header
 if [ x != "x$DEVEL_VERSION" ] ; then
-	echo "#define DEVEL_VERSION \"$DEVEL_VERSION\"" >> "$HEADER"
+	printf "#define DEVEL_VERSION \"$DEVEL_VERSION\"\n" >> "$HEADER"
 fi
diff --git a/synfig-studio/trunk/build_tools/Makefile.am b/synfig-studio/trunk/build_tools/Makefile.am
index 27edb64..29b053f 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:
-	bash $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)"
+	sh $(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 f60f4ef..605f242 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\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`
+	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'
@@ -24,8 +24,7 @@ get_git_id(){
 		BRANCH=`echo $BRANCH | cut -d ' ' -f 1`
 		BRANCH=${BRANCH#*/}
 	fi
-	export REVISION=`git show --pretty=format:%ci HEAD |  head -c 10`
-	REVISION=${REVISION:0:4}${REVISION:5:2}${REVISION:8:2}
+	export REVISION=`git show --pretty=format:%ci HEAD |  head -c 10 | tr -d '-'`
 	export COMPARE="$1/.git/"
 	# The extra * at the end is for Modified
 	#REVISION="$REVISION"`cd "$1"; [[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"`
@@ -94,7 +93,7 @@ if [ x = "x$DEVEL_VERSION" ] ; then
 		elif [ $SCM = git-svn ] ; then
 			DEVEL_VERSION="SVN r$REVISION (via git)"
 		elif [ $SCM = git ] ; then
-			DEVEL_VERSION="Revision: $REVISION\\nBranch: ${BRANCH}\\nRevision ID: $REVISION_ID"
+			DEVEL_VERSION="Revision: ${REVISION}\\\\nBranch: ${BRANCH}\\\\nRevision ID: ${REVISION_ID}"
 		elif [ $SCM = manual ] ; then
 			DEVEL_VERSION="$REVISION (manually configured)"
 		fi
@@ -104,6 +103,6 @@ fi
 
 # Output the header
 if [ x != "x$DEVEL_VERSION" ] ; then
-	echo "#define SHOW_EXTRA_INFO" > "$HEADER"
-	echo "#define DEVEL_VERSION \"$DEVEL_VERSION\"" >> "$HEADER"
+	printf "#define SHOW_EXTRA_INFO\n" > "$HEADER"
+	printf "#define DEVEL_VERSION \"$DEVEL_VERSION\"\n" >> "$HEADER"
 fi