* [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment
@ 2011-09-21 15:47 Jon Ringle
2011-09-22 8:41 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Jon Ringle @ 2011-09-21 15:47 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Jon Ringle <jon@ringle.org>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment
2011-09-21 15:47 [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment Jon Ringle
@ 2011-09-22 8:41 ` Michael Olbrich
2011-09-26 2:17 ` Jon Ringle
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2011-09-22 8:41 UTC (permalink / raw)
To: ptxdist
On Wed, Sep 21, 2011 at 11:47:05AM -0400, Jon Ringle wrote:
> Signed-off-by: Jon Ringle <jon@ringle.org>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment
2011-09-22 8:41 ` Michael Olbrich
@ 2011-09-26 2:17 ` Jon Ringle
0 siblings, 0 replies; 3+ messages in thread
From: Jon Ringle @ 2011-09-26 2:17 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Jon Ringle <jon@ringle.org>
---
bin/ptxdist | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 06e28fc..900af0f 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:-'${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|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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-26 2:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-21 15:47 [ptxdist] [PATCH] ptxdist: allow PTXDIST_PTXRC_DEFAULT to be set from environment Jon Ringle
2011-09-22 8:41 ` Michael Olbrich
2011-09-26 2:17 ` Jon Ringle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox