commit f86626ca295e423425a0d2e3688795ebf87e18df
author David 'Digit' Turner <digit@google.com> Wed May 28 08:44:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 28 08:44:55 2014 +0000
tree f3e493daa18566597f49fb00132aa4624608cca6
parent 3e143cb2bbe0ff77a0052c0a60677b76d3e17d74
parent 12d71b66db40836a671f91c934be238c7d3e87b6

am 12d71b66: Merge "resolve merge conflicts of 838c441 to master."

* commit '12d71b66db40836a671f91c934be238c7d3e87b6':
  package-release.sh: script breaks if commit msg contains single quote(')
  package-release.sh: Merge master version.

distrib/package-release.sh

diff --git a/distrib/package-release.sh b/distrib/package-release.sh
index b47e334..2cd8e2c 100755
--- a/distrib/package-release.sh
+++ b/distrib/package-release.sh
@@ -165,9 +165,10 @@
     SHA1=$(cd $GIT_DIR && git log --oneline -1 .) || \
         panic "Not a Git directory: $GIT_DIR"
 
-    SHA1=$(printf "%s" "$SHA1" | tr "'" "\\'")
+    SHA1=$(printf "%s" "$SHA1" | sed -e "s/'/\\'/g")
     eval $VARNAME=\'$SHA1\'
 }
+
 # Defaults.
 DEFAULT_REVISION=$(date +%Y%m%d)
 DEFAULT_PKG_PREFIX=android-emulator
@@ -268,11 +269,11 @@
 binaries.
 
 Valid options (defaults are inside brackets):
-    --help | -?              Print this message.
-    --package-dir=<path>     Change package output directory [$DEFAULT_PKG_DIR].
-    --revision=<name>        Change revision [$DEFAULT_REVISION].
-    --sources                Also create sources package.
-    --system=<list>          Specify host system list [$DEFAULT_SYSTEMS].
+    --help | -?           Print this message.
+    --package-dir=<path>  Change package output directory [$DEFAULT_PKG_DIR].
+    --revision=<name>     Change revision [$DEFAULT_REVISION].
+    --sources             Also create sources package.
+    --system=<list>       Specify host system list [$DEFAULT_SYSTEMS].
     --copy-prebuilts=<path>  Copy 64-bit Linux and Darwin binaries to
                              <path>/prebuilts/android-emulator/