# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1458959551 25200
# Node ID 563fbba4328802eff7d37aa14e6dfa680da73627
# Parent  efbe60d4865d2ed366cd5cd9a8c1a9bc70c9ff02# Parent  f9f0f45d2bdb71b56c9db78b8199b79d0830e3cb
Merge pull request #63 from GitHub.

diff -r efbe60d4865d -r 563fbba43288 plat/unix/update_scopedb.sh
--- a/plat/unix/update_scopedb.sh	Fri Mar 25 19:26:59 2016 -0700
+++ b/plat/unix/update_scopedb.sh	Fri Mar 25 19:32:31 2016 -0700
@@ -47,7 +47,7 @@
 echo $$ > "$DB_FILE.lock"
 
 # Remove lock and temp file if script is stopped unexpectedly.
-trap "rm -f \"$DB_FILE.lock\" \"$DB_FILE.temp\"" 0 3 4 15
+trap 'rm -f "$DB_FILE.lock" "$DB_FILE.temp"' INT QUIT TERM EXIT
 
 PREVIOUS_DIR=$(pwd)
 if [ -d "$PROJECT_ROOT" ]; then
diff -r efbe60d4865d -r 563fbba43288 plat/unix/update_tags.sh
--- a/plat/unix/update_tags.sh	Fri Mar 25 19:26:59 2016 -0700
+++ b/plat/unix/update_tags.sh	Fri Mar 25 19:32:31 2016 -0700
@@ -20,14 +20,14 @@
     echo "    -p [dir=]:      The path to the project root"
     echo "    -s [file=]:     The path to the source file that needs updating"
     echo "    -x [pattern=]:  A pattern of files to exclude"
-    echo "    -o [options=]:  An options file to read additional options from" 
+    echo "    -o [options=]:  An options file to read additional options from"
     echo "    -c:             Ask for confirmation before exiting"
     echo ""
 }
 
 
 while getopts "h?e:x:t:p:s:o:c" opt; do
-    case $opt in 
+    case $opt in
         h|\?)
             ShowUsage
             exit 0
@@ -67,13 +67,13 @@
 echo $$ > "$TAGS_FILE.lock"
 
 # Remove lock and temp file if script is stopped unexpectedly.
-trap "errorcode=$?; rm -f \"$TAGS_FILE.lock\" \"$TAGS_FILE.temp\"; exit $errorcode" INT TERM EXIT
+trap 'errorcode=$?; rm -f "$TAGS_FILE.lock" "$TAGS_FILE.temp"; exit $errorcode' INT QUIT TERM EXIT
 
 INDEX_WHOLE_PROJECT=1
 if [ -f "$TAGS_FILE" ]; then
     if [ "$UPDATED_SOURCE" != "" ]; then
         echo "Removing references to: $UPDATED_SOURCE"
-        echo "grep -v "$UPDATED_SOURCE" \"$TAGS_FILE\" > \"$TAGS_FILE.temp\""
+        echo "grep -v \"$UPDATED_SOURCE\" \"$TAGS_FILE\" > \"$TAGS_FILE.temp\""
         grep -v "$UPDATED_SOURCE" "$TAGS_FILE" > "$TAGS_FILE.temp"
         INDEX_WHOLE_PROJECT=0
     fi
@@ -99,6 +99,6 @@
 echo "Done."
 
 if [ $PAUSE_BEFORE_EXIT -eq 1 ]; then
-    read -p "Press ENTER to exit..."
+    printf "Press ENTER to exit..."
+    read -r
 fi
-