From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-qw0-f42.google.com ([209.85.216.42]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1R6P39-0006k6-Pb for ptxdist@pengutronix.de; Wed, 21 Sep 2011 17:49:29 +0200 Received: by qwm42 with SMTP id 42so2832506qwm.1 for ; Wed, 21 Sep 2011 08:49:21 -0700 (PDT) From: Jon Ringle Date: Wed, 21 Sep 2011 11:47:05 -0400 Message-Id: <1316620025-7801-1-git-send-email-jon@ringle.org> Subject: [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: , MIME-Version: 1.0 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 Signed-off-by: Jon Ringle --- 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