test-gitmw-lib.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
0eca37c63a1e03e4f33366157eb406c8182bf0e9
1 file changed
+3
-3
contrib/mw-to-git/t/test-gitmw-lib.sh
+3
-3
@@ -90,7 +90,7 @@ test_diff_directories () {
90
#
91
# Check that <dir> contains exactly <N> files
92
test_contains_N_files () {
93
- if test `ls -- "$1" | wc -l` -ne "$2"; then
93
+ if test $(ls -- "$1" | wc -l) -ne "$2"; then
94
echo "directory $1 should contain $2 files"
95
echo "it contains these files:"
96
ls "$1"
@@ -341,10 +341,10 @@ wiki_install () {
341
"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
342
"$MW_FILENAME. "\
343
"Please fix your connection and launch the script again."
344
- echo "$MW_FILENAME downloaded in `pwd`. "\
344
+ echo "$MW_FILENAME downloaded in $(pwd). "\
345
"You can delete it later if you want."
346
else
347
- echo "Reusing existing $MW_FILENAME downloaded in `pwd`."
347
+ echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
348
fi
349
archive_abs_path=$(pwd)/$MW_FILENAME
350
cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||