From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1R6eqE-0005Pr-S5 for ptxdist@pengutronix.de; Thu, 22 Sep 2011 10:41:10 +0200 Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72) (envelope-from ) id 1R6eqE-0000LY-RH for ptxdist@pengutronix.de; Thu, 22 Sep 2011 10:41:10 +0200 Date: Thu, 22 Sep 2011 10:41:10 +0200 From: Michael Olbrich Message-ID: <20110922084110.GZ27632@pengutronix.de> References: <1316620025-7801-1-git-send-email-jon@ringle.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1316620025-7801-1-git-send-email-jon@ringle.org> Subject: Re: [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Sep 21, 2011 at 11:47:05AM -0400, Jon Ringle wrote: > Signed-off-by: Jon Ringle I think, the environment variable should be called PTXDIST_PTXRC. Michael > --- > bin/ptxdist | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/bin/ptxdist b/bin/ptxdist > index 06e28fc..9e43b7f 100755 > --- a/bin/ptxdist > +++ b/bin/ptxdist > @@ -17,7 +17,7 @@ PTXDIST_PLATFORMCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_platformconfig' > PTXDIST_PLATFORMCONFIG_FALLBACK='${PTXDIST_WORKSPACE}/configs/*/platformconfig' > PTXDIST_COLLECTIONCONFIG_DEFAULT='${PTXDIST_WORKSPACE}/selected_collectionconfig' > PTXDIST_TOOLCHAIN_DEFAULT='${PTXDIST_WORKSPACE}/selected_toolchain' > -PTXDIST_PTXRC_DEFAULT='${HOME}/.ptxdist/ptxdistrc-${PTXDIST_VERSION_PTXRC}' > +PTXDIST_PTXRC_DEFAULT=${PTXDIST_PTXRC_DEFAULT:-'${HOME}/.ptxdist/ptxdistrc-${PTXDIST_VERSION_PTXRC}'} > > > # > @@ -2149,7 +2149,7 @@ setup_env() { > > unset $(/usr/bin/env | \ > sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \ > - egrep -v "^(PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|ftp_proxy${whitelist})$" ) > + egrep -v "^(PTXDIST_PTXRC_DEFAULT|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|ftp_proxy${whitelist})$" ) > > ######## the environment is clean now ######## > > -- > 1.7.0.4 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de