From patchwork Wed Jun 29 16:48:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 55539 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6F5C4384D142 for ; Wed, 29 Jun 2022 16:48:37 +0000 (GMT) X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id C68B0384B837 for ; Wed, 29 Jun 2022 16:48:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C68B0384B837 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from tarox.wildebeest.org (83-87-18-245.cable.dynamic.v4.ziggo.nl [83.87.18.245]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id DFE6430005B6; Wed, 29 Jun 2022 18:48:24 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 88D734079038; Wed, 29 Jun 2022 18:48:24 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Subject: [PATCH] config: Remove unnecessary setting/unsetting of prefix in profiles Date: Wed, 29 Jun 2022 18:48:19 +0200 Message-Id: <20220629164819.18486-1-mark@klomp.org> X-Mailer: git-send-email 2.18.4 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , Cc: Mark Wielaard Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" In both profile.csh.in and profile.sh.in we set and then unset prefix, but never use it. Signed-off-by: Mark Wielaard --- config/ChangeLog | 5 +++++ config/profile.csh.in | 2 -- config/profile.sh.in | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index cfb37b42..603fbcb0 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2022-06-29 Mark Wielaard + + * profile.csh.in: Remove setting/unsetting of prefix. + * profile.sh.in: Likewise. + 2022-05-03 Mark Wielaard * profile.csh.in: Move the 2>/dev/null inside the sh -c '' quotes. diff --git a/config/profile.csh.in b/config/profile.csh.in index 74c20c99..b61b467b 100644 --- a/config/profile.csh.in +++ b/config/profile.csh.in @@ -5,12 +5,10 @@ # such as $DEBUGINFOD_MAXSIZE, $DEBUGINFOD_MAXTIME, $DEBUGINFOD_PROGRESS. if (! $?DEBUGINFOD_URLS) then - set prefix="@prefix@" set DEBUGINFOD_URLS=`sh -c 'cat "$0"/*.urls 2>/dev/null; :' "@sysconfdir@/debuginfod" | tr '\n' ' '` if ( "$DEBUGINFOD_URLS" != "" ) then setenv DEBUGINFOD_URLS "$DEBUGINFOD_URLS" else unset DEBUGINFOD_URLS endif - unset prefix endif diff --git a/config/profile.sh.in b/config/profile.sh.in index bad20b1e..9a978a6b 100644 --- a/config/profile.sh.in +++ b/config/profile.sh.in @@ -5,8 +5,6 @@ # such as $DEBUGINFOD_MAXSIZE, $DEBUGINFOD_MAXTIME, $DEBUGINFOD_PROGRESS. if [ -z "$DEBUGINFOD_URLS" ]; then - prefix="@prefix@" DEBUGINFOD_URLS=$(cat "@sysconfdir@/debuginfod"/*.urls 2>/dev/null | tr '\n' ' ') [ -n "$DEBUGINFOD_URLS" ] && export DEBUGINFOD_URLS || unset DEBUGINFOD_URLS - unset prefix fi