From: Nicholas Clark Date: Wed, 31 Dec 2008 07:16:50 +0000 (-0800) Subject: Solaris /bin/sh doesn't do POSIX $( ... ) syntax for ` .... ` X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8ffec826be729d9e6b57b1c75aba2efd9067825d;p=p5sagit%2Fp5-mst-13.2.git Solaris /bin/sh doesn't do POSIX $( ... ) syntax for ` .... ` --- diff --git a/make_patchnum.sh b/make_patchnum.sh index c9c74af..2a882c4 100644 --- a/make_patchnum.sh +++ b/make_patchnum.sh @@ -8,9 +8,9 @@ # lib/Config_git.pl # holds some special configure settings related to git # unpushed.h # header file used by patchlevel.h to store unpushed commits -existing_patchnum=$(cat .patchnum 2>/dev/null) -existing_config=$(cat lib/Config_git.pl 2>/dev/null) -existing_unpushed=$(cat unpushed.h 2>/dev/null) +existing_patchnum=`cat .patchnum 2>/dev/null` +existing_config=`cat lib/Config_git.pl 2>/dev/null` +existing_unpushed=`cat unpushed.h 2>/dev/null` unpushed_commits='/*no-op*/' if [ -s ".patch" ] ; then @@ -19,17 +19,17 @@ if [ -s ".patch" ] ; then extra_info="git_snapshot_date='$snapshot_created'" commit_title='Snapshot of:' elif [ -d ".git" ]; then - branch=$(git branch | awk 'BEGIN{ORS=""} /\*/ { print $2 }') - test -n "$branch" && remote=$(git config branch.$branch.remote) - commit_id=$(git rev-parse HEAD) - changed=$(git diff-index --name-only HEAD) - describe=$(git describe --tags) - commit_created=$(git log -1 --pretty='format:%ci') + branch=`git branch | awk 'BEGIN{ORS=""} /\*/ { print $2 }'` + test -n "$branch" && remote=`git config branch.$branch.remote` + commit_id=`git rev-parse HEAD` + changed=`git diff-index --name-only HEAD` + describe=`git describe --tags` + commit_created=`git log -1 --pretty='format:%ci'` new_patchnum="describe: $describe" extra_info="git_commit_date='$commit_created'" if [ -n "$branch" ] && [ -n "$remote" ]; then - unpushed_commit_list=$(git cherry $remote/$branch | awk 'BEGIN{ORS=","} /+/ {print $2}' | sed -e 's/,$//') - unpushed_commits=$(git cherry $remote/$branch | awk 'BEGIN{ORS="\t\\\n"} /+/ {print ",\"" $2 "\""}') + unpushed_commit_list=`git cherry $remote/$branch | awk 'BEGIN{ORS=","} /+/ {print $2}' | sed -e 's/,$//'` + unpushed_commits=`git cherry $remote/$branch | awk 'BEGIN{ORS="\t\\\n"} /+/ {print ",\"" $2 "\""}'` if [ -n "$unpushed_commits" ]; then commit_title="Local Commit:" @@ -49,7 +49,7 @@ status: uncommitted-changes" test -z "$commit_title" && commit_title='Commit id:' fi -new_unpushed=$(cat <