appp.sh: use the $( ... ) construct for command substitution
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elia Pinto committed
Apr 23, 2014 at 06:43 UTC
faf58f4ee6a5599c3b8790b770d6e1736174b7a3
1 file changed
+7
-7
contrib/thunderbird-patch-inline/appp.sh
+7
-7
@@ -10,7 +10,7 @@ CONFFILE=~/.appprc
10
11
SEP="-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-"
12
if [ -e "$CONFFILE" ] ; then
13
- LAST_DIR=`grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//'`
13
+ LAST_DIR=$(grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//')
14
cd "${LAST_DIR}"
15
else
16
cd > /dev/null
@@ -25,11 +25,11 @@ fi
25
26
cd - > /dev/null
27
28
-SUBJECT=`sed -n -e '/^Subject: /p' "${PATCH}"`
29
-HEADERS=`sed -e '/^'"${SEP}"'$/,$d' $1`
30
-BODY=`sed -e "1,/${SEP}/d" $1`
31
-CMT_MSG=`sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}"`
32
-DIFF=`sed -e '1,/^---$/d' "${PATCH}"`
28
+SUBJECT=$(sed -n -e '/^Subject: /p' "${PATCH}")
29
+HEADERS=$(sed -e '/^'"${SEP}"'$/,$d' $1)
30
+BODY=$(sed -e "1,/${SEP}/d" $1)
31
+CMT_MSG=$(sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}")
32
+DIFF=$(sed -e '1,/^---$/d' "${PATCH}")
33
34
CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
35
-e 's/^Signed-off-by: \(.*\)/\1,/gp'`
@@ -48,7 +48,7 @@ if [ "x${BODY}x" != "xx" ] ; then
48
fi
49
echo "$DIFF" >> $1
50
51
-LAST_DIR=`dirname "${PATCH}"`
51
+LAST_DIR=$(dirname "${PATCH}")
52
53
grep -v "^LAST_DIR=" "${CONFFILE}" > "${CONFFILE}_"
54
echo "LAST_DIR=${LAST_DIR}" >> "${CONFFILE}_"