From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 756 invoked by alias); 26 Aug 2014 23:28:05 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Received: (qmail 679 invoked by uid 89); 26 Aug 2014 23:28:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f177.google.com Received: from mail-we0-f177.google.com (HELO mail-we0-f177.google.com) (74.125.82.177) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 26 Aug 2014 23:28:03 +0000 Received: by mail-we0-f177.google.com with SMTP id w62so15362751wes.22 for ; Tue, 26 Aug 2014 16:28:00 -0700 (PDT) X-Received: by 10.180.73.6 with SMTP id h6mr24305218wiv.65.1409095680904; Tue, 26 Aug 2014 16:28:00 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id pk9sm12035179wjb.16.2014.08.26.16.27.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Aug 2014 16:28:00 -0700 (PDT) From: "Yann E. MORIN" To: crossgcc@sourceware.org Cc: "Yann E. MORIN" , Fabian Freyer Subject: [PATCH 3/3] scripts/crosstool-NG: use ${grep} instead of 'grep' Date: Tue, 26 Aug 2014 23:28:00 -0000 Message-Id: <70a665929fe0568d767f79b8f98b5619493c90c9.1409095485.git.yann.morin.1998@free.fr> In-Reply-To: References: X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00037.txt.bz2 Helps building on BSD-like systems. Reported-by: Fabian Freyer Signed-off-by: "Yann E. MORIN" Cc: Fabian Freyer --- scripts/crosstool-NG.sh.in | 6 +++--- scripts/functions | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 3699500..3359bac 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -125,7 +125,7 @@ CT_DoLog INFO "Build started ${CT_STAR_DATE_HUMAN}" # We really need to extract from ,config and not .config.2, as we # do want the kconfig's values, not our mangled config with arrays. CT_DoStep DEBUG "Dumping user-supplied crosstool-NG configuration" -CT_DoExecLog DEBUG grep -E '^(# |)CT_' .config +CT_DoExecLog DEBUG ${grep} -E '^(# |)CT_' .config CT_EndStep CT_DoLog DEBUG "Unsetting and unexporting MAKEFLAGS" @@ -570,9 +570,9 @@ if [ -z "${CT_RESTART}" ]; then CT_DoLog EXTRA " build = ${CT_REAL_BUILD}" CT_DoLog EXTRA " host = ${CT_REAL_HOST}" CT_DoLog EXTRA " target = ${CT_TARGET}" - set |grep -E '^CT_.+=' |sort |CT_DoLog DEBUG + set |${grep} -E '^CT_.+=' |sort |CT_DoLog DEBUG CT_DoLog DEBUG "Other environment:" - printenv |grep -v -E '^CT_.+=' |CT_DoLog DEBUG + printenv |${grep} -v -E '^CT_.+=' |CT_DoLog DEBUG CT_EndStep fi diff --git a/scripts/functions b/scripts/functions index cce629c..a309f2d 100644 --- a/scripts/functions +++ b/scripts/functions @@ -995,9 +995,9 @@ CT_ExtractGit() { if [ -z "${ref}" ]; then ref_type=head ref=$(git rev-list -n1 HEAD) - elif git tag |grep -E "^${ref}$" >/dev/null 2>&1; then + elif git tag |${grep} -E "^${ref}$" >/dev/null 2>&1; then ref_type=tag - elif git branch -a --no-color |grep -E "^. ${ref}$" >/dev/null 2>&1; then + elif git branch -a --no-color |${grep} -E "^. ${ref}$" >/dev/null 2>&1; then ref_type=branch elif date -d "${ref}" >/dev/null 2>&1; then ref_type=date -- 1.9.1 -- For unsubscribe information see http://sourceware.org/lists.html#faq