From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: matthieu.moy@grenoble-inp.fr, Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 02/14] test-gitmw-lib.sh: use the $( ... ) construct for command substitution
Date: Wed, 23 Apr 2014 06:43:54 -0700 [thread overview]
Message-ID: <1398260646-2660-2-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1398260646-2660-1-git-send-email-gitter.spiros@gmail.com>
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>
---
contrib/mw-to-git/t/test-gitmw-lib.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index 3372b2a..c783752 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -90,7 +90,7 @@ test_diff_directories () {
#
# Check that <dir> contains exactly <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 "it contains these files:"
ls "$1"
@@ -341,10 +341,10 @@ wiki_install () {
"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
"$MW_FILENAME. "\
"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."
else
- echo "Reusing existing $MW_FILENAME downloaded in `pwd`."
+ echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
fi
archive_abs_path=$(pwd)/$MW_FILENAME
cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||
--
1.7.10.4
next prev parent reply other threads:[~2014-04-23 13:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-23 13:43 [PATCH 01/14] t9365-continuing-queries.sh: use the $( ... ) construct for command substitution Elia Pinto
2014-04-23 13:43 ` Elia Pinto [this message]
2014-04-23 13:43 ` [PATCH 03/14] t7900-subtree.sh: " Elia Pinto
2014-04-23 13:43 ` [PATCH 04/14] appp.sh: " Elia Pinto
2014-04-25 22:58 ` brian m. carlson
2014-04-28 17:53 ` Junio C Hamano
2014-04-28 18:07 ` Matthieu Moy
2014-04-28 19:20 ` Junio C Hamano
2014-04-23 13:43 ` [PATCH 05/14] txt-to-pot.sh: " Elia Pinto
2014-04-23 14:44 ` Matthieu Moy
2014-04-23 13:43 ` [PATCH 06/14] git-pull.sh: " Elia Pinto
2014-04-23 13:43 ` [PATCH 07/14] git-rebase--merge.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 08/14] git-rebase.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 09/14] git-stash.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 10/14] git-web--browse.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 11/14] lib-credential.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 12/14] lib-cvs.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 13/14] lib-gpg.sh: " Elia Pinto
2014-04-23 13:44 ` [PATCH 14/14] p5302-pack-index.sh: " Elia Pinto
2014-04-23 14:45 ` [PATCH 01/14] t9365-continuing-queries.sh: " Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398260646-2660-2-git-send-email-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
--cc=matthieu.moy@grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).