threads / patch / 19734

patchcontrib/hooks/post-receive-email: Fix solaris portability issues.

Subject: [PATCH] contrib/hooks/post-receive-email: Fix solaris portability issues.

## tl;dr

2 messages between Jun 8, 2009 and Jun 8, 2009. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Thomas Moulard· Jun 8, 2009, 07:02 UTC · lore

This patch solves some issues I had on a Solaris system: $ showrev -c /bin/sh | grep version Command version: SunOS 5.10 Generic 121005-03 Oct 2006

1. Replace $(...) by backquotes.
2. Replace shell substitution ${var##word} by echo + sed
3. Replace grep -F by fgrep.

These portability problems are reported in Autoconf documentation: http://www.gnu.org/software/hello/manual/autoconf/Shell-Substitutions.html#Shell-Substitutions

---
 contrib/hooks/post-receive-email |   60 +++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 30 deletions(-)
Show changes to contrib/hooks/post-receive-email +30 −31
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 2a66063..3d00475 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -74,8 +74,8 @@
 generate_email()
 {
 	# --- Arguments
-	oldrev=$(git rev-parse $1)
-	newrev=$(git rev-parse $2)
+	oldrev=`git rev-parse $1`
+	newrev=`git rev-parse $2`
 	refname="$3"

 	# --- Interpret
@@ -95,8 +95,8 @@ generate_email()
 	fi

 	# --- Get the revision types
-	newrev_type=$(git cat-file -t $newrev 2> /dev/null)
-	oldrev_type=$(git cat-file -t "$oldrev" 2> /dev/null)
+	newrev_type=`git cat-file -t $newrev 2> /dev/null`
+	oldrev_type=`git cat-file -t "$oldrev" 2> /dev/null`
 	case "$change_type" in
 	create|update)
 		rev="$newrev"
@@ -118,12 +118,12 @@ generate_email()
 		refs/tags/*,commit)
 			# un-annotated tag
 			refname_type="tag"
-			short_refname=${refname##refs/tags/}
+			short_refname=`echo "$refname" | sed 's|refs/tags/||'`
 			;;
 		refs/tags/*,tag)
 			# annotated tag
 			refname_type="annotated tag"
-			short_refname=${refname##refs/tags/}
+			short_refname=`echo "$refname" | sed 's|refs/tags/||'`
 			# change recipients
 			if [ -n "$announcerecipients" ]; then
 				recipients="$announcerecipients"
@@ -132,12 +132,12 @@ generate_email()
 		refs/heads/*,commit)
 			# branch
 			refname_type="branch"
-			short_refname=${refname##refs/heads/}
+			short_refname=`echo "$refname" | sed 's|refs/heads/||'`
 			;;
 		refs/remotes/*,commit)
 			# tracking branch
 			refname_type="tracking branch"
-			short_refname=${refname##refs/remotes/}
+			short_refname=`echo "$refname" | sed 's|refs/remotes/||'`
 			echo >&2 "*** Push-update of tracking branch, $refname"
 			echo >&2 "***  - no email generated."
 			exit 0
@@ -168,7 +168,7 @@ generate_email()
 	# Email parameters
 	# The email subject will contain the best description of the ref
 	# that we can build from the parameters
-	describe=$(git describe $rev 2>/dev/null)
+	describe=`git describe $rev 2>/dev/null`
 	if [ -z "$describe" ]; then
 		describe=$rev
 	fi
@@ -279,7 +279,7 @@ generate_update_branch_email()
 	# all of our commits.  What we really want is to exclude the current
 	# value of $refname from the --not list, rather than N itself.  So:
 	#
-	#  git rev-parse --not --all | grep -v $(git rev-parse $refname)
+	#  git rev-parse --not --all | grep -v `git rev-parse $refname`
 	#
 	# Get's us to something pretty safe (apart from the small time
 	# between refname being read, and git rev-parse running - for that,
@@ -320,9 +320,9 @@ generate_update_branch_email()
 	# revisions
 	fast_forward=""
 	rev=""
-	for rev in $(git rev-list $newrev..$oldrev)
+	for rev in `git rev-list $newrev..$oldrev`
 	do
-		revtype=$(git cat-file -t "$rev")
+		revtype=`git cat-file -t "$rev"`
 		echo "  discards  $rev ($revtype)"
 	done
 	if [ -z "$rev" ]; then
@@ -334,9 +334,9 @@ generate_update_branch_email()
 	# have already had notification emails and is present to show the
 	# full detail of the change from rolling back the old revision to
 	# the base revision and then forward to the new revision
-	for rev in $(git rev-list $oldrev..$newrev)
+	for rev in `git rev-list $oldrev..$newrev`
 	do
-		revtype=$(git cat-file -t "$rev")
+		revtype=`git cat-file -t "$rev"`
 		echo "       via  $rev ($revtype)"
 	done

@@ -357,7 +357,7 @@ generate_update_branch_email()

 		# Find the common ancestor of the old and new revisions and
 		# compare it with newrev
-		baserev=$(git merge-base $oldrev $newrev)
+		baserev=`git merge-base $oldrev $newrev`
 		rewind_only=""
 		if [ "$baserev" = "$newrev" ]; then
 			echo "This update discarded existing revisions and left the branch pointing at"
@@ -460,12 +460,12 @@ generate_atag_email()
 {
 	# Use git for-each-ref to pull out the individual fields from the
 	# tag
-	eval $(git for-each-ref --shell --format='
+	eval `git for-each-ref --shell --format='
 	tagobject=%(*objectname)
 	tagtype=%(*objecttype)
 	tagger=%(taggername)
 	tagged=%(taggerdate)' $refname
-	)
+	`

 	echo "   tagging  $tagobject ($tagtype)"
 	case "$tagtype" in
@@ -474,14 +474,14 @@ generate_atag_email()
 		# If the tagged object is a commit, then we assume this is a
 		# release, and so we calculate which tag this tag is
 		# replacing
-		prevtag=$(git describe --abbrev=0 $newrev^ 2>/dev/null)
+		prevtag=`git describe --abbrev=0 $newrev^ 2>/dev/null`

 		if [ -n "$prevtag" ]; then
 			echo "  replaces  $prevtag"
 		fi
 		;;
 	*)
-		echo "    length  $(git cat-file -s $tagobject) bytes"
+		echo "    length  `git cat-file -s $tagobject` bytes"
 		;;
 	esac
 	echo " tagged by  $tagger"
@@ -578,7 +578,7 @@ generate_general_email()
 		# a commit, so there is no log for us to display.  It's
 		# probably not wise to output git cat-file as it could be a
 		# binary blob.  We'll just say how big it is
-		echo "$newrev is a $newrev_type, and is $(git cat-file -s $newrev) bytes long."
+		echo "$newrev is a $newrev_type, and is `git cat-file -s $newrev` bytes long."
 	fi
 }

@@ -619,8 +619,8 @@ show_new_revisions()
 		revspec=$oldrev..$newrev
 	fi

-	other_branches=$(git for-each-ref --format='%(refname)' refs/heads/ |
-	    grep -F -v $refname)
+	other_branches=`git for-each-ref --format='%(refname)' refs/heads/ |
+	    fgrep -v $refname`
 	git rev-parse --not $other_branches |
 	if [ -z "$custom_showrev" ]
 	then
@@ -629,7 +629,7 @@ show_new_revisions()
 		git rev-list --stdin $revspec |
 		while read onerev
 		do
-			eval $(printf "$custom_showrev" $onerev)
+			eval `printf "$custom_showrev" $onerev`
 		done
 	fi
 }
@@ -653,13 +653,13 @@ LOGEND="-----------------------------------------------------------------------"
 # --- Config
 # Set GIT_DIR either from the working directory, or from the environment
 # variable.
-GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
+GIT_DIR=`git rev-parse --git-dir 2>/dev/null`
 if [ -z "$GIT_DIR" ]; then
 	echo >&2 "fatal: post-receive: GIT_DIR not set"
 	exit 1
 fi

-projectdesc=$(sed -ne '1p' "$GIT_DIR/description")
+projectdesc=`sed -ne '1p' "$GIT_DIR/description"`
 # Check if the description is unchanged from it's default, and shorten it to
 # a more manageable length if it is
 if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
@@ -667,11 +667,11 @@ then
 	projectdesc="UNNAMED PROJECT"
 fi

-recipients=$(git config hooks.mailinglist)
-announcerecipients=$(git config hooks.announcelist)
-envelopesender=$(git config hooks.envelopesender)
-emailprefix=$(git config hooks.emailprefix || echo '[SCM] ')
-custom_showrev=$(git config hooks.showrev)
+recipients=`git config hooks.mailinglist`
+announcerecipients=`git config hooks.announcelist`
+envelopesender=`git config hooks.envelopesender`
+emailprefix=`git config hooks.emailprefix || echo '[SCM] '`
+custom_showrev=`git config hooks.showrev`

 # --- Main loop
 # Allow dual mode: run from the command line just like the update hook, or
--
1.6.3
Junio C Hamano· Jun 8, 2009, 07:42 UTC · re: Thomas Moulard · lore

Re: [PATCH] contrib/hooks/post-receive-email: Fix solaris portability issues.

Thomas Moulard <thomas.moulard@gmail.com> writes:
Show 7 quoted lines
> This patch solves some issues I had on a Solaris system:
> $ showrev -c /bin/sh | grep version
> Command version: SunOS 5.10 Generic 121005-03 Oct 2006
>
> 1. Replace $(...) by backquotes.
> 2. Replace shell substitution ${var##word} by echo + sed
> 3. Replace grep -F by fgrep.
Thanks for trying to be helpful, but regrettably I have to say no.

Earlier we already declared that any Bourne variant that does not understand $() is unfit to use with git as a general rule, but that particular general rule was really meant to exclude broken /bin/sh on Solaris. We recommend using either ksh or /usr/xpg4/bin/sh on that platform.

Perhaps SunOS 5.10 has a better /bin/sh than what people tried earlier, and with this patch everything start to magically work well on the platform. I however somehow doubt it.

There are tons of "$()" construct in our scripted Porcelain commands, and I think there are even nested ones that you cannot replace with "``" without introducing new variables and contaminating the namespace.

Even though I am a traditionist, I personally would not want to see a patch to rewrite them back to ``, because that will force me to verify that de-nesting of $(foo $(bar baz)) is done properly, that interaction between `` and double quotes are handled correctly, and that namespace contamination does not have any ill effects, etc. etc.

Show 6 quoted lines
> @@ -118,12 +118,12 @@ generate_email()
>  		refs/tags/*,commit)
>  			# un-annotated tag
>  			refname_type="tag"
> -			short_refname=${refname##refs/tags/}
> +			short_refname=`echo "$refname" | sed 's|refs/tags/||'`
I think we used to write
	sed -e 's|^refs/tags/||'
all over the place, but they were later replaced with "${var#word}".

In any case, this particular rewrite is wrong; you need to anchor the pattern at the left end (so are other uses of 's|refs/xxx/||' in your patch).

← back to recent threads