Skip to content

Commit faf58f4

Browse files
devzero2000gitster
authored andcommitted
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 <[email protected]> Reviewed-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5c00acd commit faf58f4

File tree

1 file changed

+7
-7
lines changed
  • contrib/thunderbird-patch-inline

1 file changed

+7
-7
lines changed

contrib/thunderbird-patch-inline/appp.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CONFFILE=~/.appprc
1010

1111
SEP="-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-"
1212
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=//')
1414
cd "${LAST_DIR}"
1515
else
1616
cd > /dev/null
@@ -25,11 +25,11 @@ fi
2525

2626
cd - > /dev/null
2727

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}")
3333

3434
CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
3535
-e 's/^Signed-off-by: \(.*\)/\1,/gp'`
@@ -48,7 +48,7 @@ if [ "x${BODY}x" != "xx" ] ; then
4848
fi
4949
echo "$DIFF" >> $1
5050

51-
LAST_DIR=`dirname "${PATCH}"`
51+
LAST_DIR=$(dirname "${PATCH}")
5252

5353
grep -v "^LAST_DIR=" "${CONFFILE}" > "${CONFFILE}_"
5454
echo "LAST_DIR=${LAST_DIR}" >> "${CONFFILE}_"

0 commit comments

Comments
 (0)