From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH 04/14] appp.sh: use the $( ... ) construct for command substitution Date: Wed, 23 Apr 2014 06:43:56 -0700 Message-ID: <1398260646-2660-4-git-send-email-gitter.spiros@gmail.com> References: <1398260646-2660-1-git-send-email-gitter.spiros@gmail.com> Cc: matthieu.moy@grenoble-inp.fr, Elia Pinto To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 23 15:49:46 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WcxYW-0005CP-QA for gcvg-git-2@plane.gmane.org; Wed, 23 Apr 2014 15:49:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756417AbaDWNta (ORCPT ); Wed, 23 Apr 2014 09:49:30 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:60001 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328AbaDWNoR (ORCPT ); Wed, 23 Apr 2014 09:44:17 -0400 Received: by mail-pa0-f49.google.com with SMTP id lj1so779233pab.22 for ; Wed, 23 Apr 2014 06:44:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qRjTlKldVDUvktKADsEhgtkmscEAKu2OHs/eZ2AcFNQ=; b=OuqmBkri7XtGIAxN4B1KtBSlSdenzbhvUD/kLmL/PisBYCV9FZ2Vls5LWU0bX3+4FB E1V5EXPnvDrjVSeP+Pd66QEcrHeXexIIZRp2Xq33JHngwEobAeZKjHhPLQpui+9tRqVc lggpMiKFvLH3nNuakv+XCa3I2EQfAnek6sfVq0EqqLGc+GIgsy/JesV5hIl7BmGMSeVh qUCHk5F7FKaQFZkXVQBWp1TmVgvC0P6s6P91Thv3Jqmss9wz9ZLqpRt7icjS0ql/wE6s RDK21tvVhB66ePJMGz5fGRSoRCUo2+QRFJxVaCoTkyzXWB1Alt3Fna7mf2/wUmlSflRF 1s5w== X-Received: by 10.68.94.164 with SMTP id dd4mr9824013pbb.161.1398260656728; Wed, 23 Apr 2014 06:44:16 -0700 (PDT) Received: from devzero2000ubu.nephoscale.com (140.195.207.67.nephoscale.net. [67.207.195.140]) by mx.google.com with ESMTPSA id kt8sm5314475pab.7.2014.04.23.06.44.15 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 06:44:15 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398260646-2660-1-git-send-email-gitter.spiros@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- contrib/thunderbird-patch-inline/appp.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/thunderbird-patch-inline/appp.sh b/contrib/thunderbird-patch-inline/appp.sh index 5eb4a51..8dc73ec 100755 --- a/contrib/thunderbird-patch-inline/appp.sh +++ b/contrib/thunderbird-patch-inline/appp.sh @@ -10,7 +10,7 @@ CONFFILE=~/.appprc SEP="-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-" if [ -e "$CONFFILE" ] ; then - LAST_DIR=`grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//'` + LAST_DIR=$(grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//') cd "${LAST_DIR}" else cd > /dev/null @@ -25,11 +25,11 @@ fi cd - > /dev/null -SUBJECT=`sed -n -e '/^Subject: /p' "${PATCH}"` -HEADERS=`sed -e '/^'"${SEP}"'$/,$d' $1` -BODY=`sed -e "1,/${SEP}/d" $1` -CMT_MSG=`sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}"` -DIFF=`sed -e '1,/^---$/d' "${PATCH}"` +SUBJECT=$(sed -n -e '/^Subject: /p' "${PATCH}") +HEADERS=$(sed -e '/^'"${SEP}"'$/,$d' $1) +BODY=$(sed -e "1,/${SEP}/d" $1) +CMT_MSG=$(sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}") +DIFF=$(sed -e '1,/^---$/d' "${PATCH}") CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \ -e 's/^Signed-off-by: \(.*\)/\1,/gp'` @@ -48,7 +48,7 @@ if [ "x${BODY}x" != "xx" ] ; then fi echo "$DIFF" >> $1 -LAST_DIR=`dirname "${PATCH}"` +LAST_DIR=$(dirname "${PATCH}") grep -v "^LAST_DIR=" "${CONFFILE}" > "${CONFFILE}_" echo "LAST_DIR=${LAST_DIR}" >> "${CONFFILE}_" -- 1.7.10.4