From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AD3FB4AC9B for ; Thu, 18 Jul 2024 14:49:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 597C368DA0F; Thu, 18 Jul 2024 17:49:23 +0300 (EEST) Received: from mail-40110.protonmail.ch (mail-40110.protonmail.ch [185.70.40.110]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 701D868D8CD for ; Thu, 18 Jul 2024 17:49:16 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marcusspencer.xyz; s=protonmail; t=1721314155; x=1721573355; bh=13hPLKInwHL0l/8FyUdpJGJ+bjmFYn1in2JlYJxJWqU=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=OwxbVAUUEjPdN/cH+XZBIN1wGDGI4NCi/OZQ/O/pSoYHBRldDT5LEwmM4qdjZ1Ssf yxALxlzKTmZzEGJ2b/Mp49hakX93J94vYrWpSenYRiW8jbmO+CbeYXKLivmT4+wyG1 0MQp7934ZrGmacpYUk+FM9eyuch7XmNfq2x5SMJabFhYMakacyBMze6HWzOmRW/miZ ov+LEljWa4J1nILaG+GJDe+7e8mnuV5dfS3RLRoycSaTe6Nl8FMfvo+6kOuDUcUEOI BVLRe0vXfexvA8y2QBovcrC6Tx6XdQUee7J1ElL+pP7bV9vaXBpMXHyBl26JYkLLXl lkJ3+t4GCukXg== X-Pm-Submission-Id: 4WPwgG0V9Zz92 From: Marcus B Spencer To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jul 2024 09:48:57 -0500 Message-ID: <20240718144858.11834-1-marcus@marcusspencer.xyz> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] tools/murge, tools/patcheck: use `grep -E` X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marcus B Spencer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Use `grep -E` instead of egrep, because it is deprecated. See common question #17 under https://www.gnu.org/software/grep/manual/grep.html#Usage-1 Signed-off-by: Marcus B Spencer --- tools/murge | 6 +++--- tools/patcheck | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/murge b/tools/murge index f22fcfda81..d43a19bb8b 100755 --- a/tools/murge +++ b/tools/murge @@ -1,9 +1,9 @@ #!/bin/sh grep -A99999 '^<<<<<<<' | grep -B99999 '^>>>>>>>' >murge.X -grep -A99999 '^====' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs -grep -B99999 '^||||' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours -grep -B99999 '^====' murge.X | grep -A99999 '^||||' | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.common +grep -A99999 '^====' murge.X | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs +grep -B99999 '^||||' murge.X | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours +grep -B99999 '^====' murge.X | grep -A99999 '^||||' | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.common colordiff -du $* murge.ours murge.theirs grep . murge.common > /dev/null && colordiff -du $* murge.common murge.theirs diff --git a/tools/patcheck b/tools/patcheck index 934e5b9451..ee310cdd07 100755 --- a/tools/patcheck +++ b/tools/patcheck @@ -9,7 +9,7 @@ if [ $# = 0 ]; then fi GREP=grep -EGREP=egrep +EGREP="$GREP -E" TMP=patcheck.tmp OPT="-nH" #FILES=$($GREP '^+++' $* | sed 's/+++ //g') -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".