undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-gitmw-lib.sh: use the $( ... ) construct for command substitution

Browse Source 
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>
This commit is contained in:
Elia Pinto 2014-04-23 06:43:54 -07:00 committed by Junio C Hamano
parent 9bfeaa0bcf
commit 0eca37c63a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/mw-to-git/t/test-gitmw-lib.sh
View File

@ -90,7 +90,7 @@ test_diff_directories () {
# #
# Check that <dir> contains exactly <N> files # Check that <dir> contains exactly <N> files
test_contains_N_files () { test_contains_N_files () {
if test `ls -- "$1" | wc -l` -ne "$2"; then if test $(ls -- "$1" | wc -l) -ne "$2"; then
echo "directory $1 should contain $2 files" echo "directory $1 should contain $2 files"
echo "it contains these files:" echo "it contains these files:"
ls "$1" ls "$1"
@ -341,10 +341,10 @@ wiki_install () {
"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\ "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
"$MW_FILENAME. "\ "$MW_FILENAME. "\
"Please fix your connection and launch the script again." "Please fix your connection and launch the script again."
echo "$MW_FILENAME downloaded in `pwd`. "\ echo "$MW_FILENAME downloaded in $(pwd). "\
"You can delete it later if you want." "You can delete it later if you want."
else else
echo "Reusing existing $MW_FILENAME downloaded in `pwd`." echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
fi fi
archive_abs_path=$(pwd)/$MW_FILENAME archive_abs_path=$(pwd)/$MW_FILENAME
cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" || cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||