From: Fabian Groffen Date: Tue, 1 Jul 2008 18:39:57 +0000 (-0000) Subject: make sure we do not clash with standard names for expansion, as e.g. $BASH X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ab3ad5dcd8ef48d7b07201c7fe4f985ce3e33582;p=portage.git make sure we do not clash with standard names for expansion, as e.g. $BASH svn path=/main/branches/prefix/; revision=10883 --- diff --git a/acinclude.m4 b/acinclude.m4 index bb73db5ac..aca8d93f6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -16,7 +16,7 @@ dnl GENTOO_PATH_PYTHON([minimum-version], [path]) dnl author: Fabian Groffen AC_DEFUN([GENTOO_PATH_PYTHON], [ - AC_PATH_PROG([PYTHON], [python], no, $2) + AC_PATH_PROG([PORTAGE_PYTHON], [python], no, $2) dnl is is there at all? if test "$PYTHON" = "no" ; then diff --git a/bin/archive-conf b/bin/archive-conf index 4caa1d564..f32edf296 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py index a9f22a543..bf70d607d 100755 --- a/bin/check-implicit-pointer-usage.py +++ b/bin/check-implicit-pointer-usage.py @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Ripped from HP and updated from Debian # Update by Gentoo to support unicode output diff --git a/bin/chkcontents b/bin/chkcontents index e38bdedec..4bdf34c2e 100755 --- a/bin/chkcontents +++ b/bin/chkcontents @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/clean_locks b/bin/clean_locks index bae8a9759..26add5adf 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dispatch-conf b/bin/dispatch-conf index a8159cdc9..557a50734 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dobin b/bin/dobin index 164ff644a..57a07a809 100755 --- a/bin/dobin +++ b/bin/dobin @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doconfd b/bin/doconfd index 0bbcab90e..683bef29c 100755 --- a/bin/doconfd +++ b/bin/doconfd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dodir b/bin/dodir index 4c335d57e..62547090c 100755 --- a/bin/dodir +++ b/bin/dodir @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dodoc b/bin/dodoc index 01fe8c538..343ee91f3 100755 --- a/bin/dodoc +++ b/bin/dodoc @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doenvd b/bin/doenvd index 3283cd475..920681ea2 100755 --- a/bin/doenvd +++ b/bin/doenvd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doexe b/bin/doexe index caed3e735..cfb6a72e2 100755 --- a/bin/doexe +++ b/bin/doexe @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dohard b/bin/dohard index 0eb3a7819..33813c7e9 100755 --- a/bin/dohard +++ b/bin/dohard @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dohtml b/bin/dohtml index db5aaaba6..6bc41ff02 100755 --- a/bin/dohtml +++ b/bin/dohtml @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doinfo b/bin/doinfo index b40fd29e5..c263a093a 100755 --- a/bin/doinfo +++ b/bin/doinfo @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doinitd b/bin/doinitd index bd8d3ce29..527874dae 100755 --- a/bin/doinitd +++ b/bin/doinitd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doins b/bin/doins index 9b2d9f413..009ae47ed 100755 --- a/bin/doins +++ b/bin/doins @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dolib b/bin/dolib index 190ec26d5..95d764037 100755 --- a/bin/dolib +++ b/bin/dolib @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dolib.a b/bin/dolib.a index 22c570587..f65f9423f 100755 --- a/bin/dolib.a +++ b/bin/dolib.a @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dolib.so b/bin/dolib.so index 63baaae00..0732ca5d3 100755 --- a/bin/dolib.so +++ b/bin/dolib.so @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/doman b/bin/doman index 1102c4d07..0ee656bef 100755 --- a/bin/doman +++ b/bin/doman @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/domo b/bin/domo index dc3f7d00f..9f41c360d 100755 --- a/bin/domo +++ b/bin/domo @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dosbin b/bin/dosbin index c2b1eb063..9da3c3397 100755 --- a/bin/dosbin +++ b/bin/dosbin @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dosed b/bin/dosed index 137457a28..951f581d7 100755 --- a/bin/dosed +++ b/bin/dosed @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/dosym b/bin/dosym index 8d0acd563..32043d247 100755 --- a/bin/dosym +++ b/bin/dosym @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/ebuild b/bin/ebuild index 1f6088654..4a4f0a034 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-src/portage/bin/ebuild,v 1.18.2.3 2005/05/07 04:32:59 ferringb Exp $ diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 46060a9e0..f0b9312eb 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/ecompress b/bin/ecompress index db007f0bf..4c73689f0 100755 --- a/bin/ecompress +++ b/bin/ecompress @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/ecompressdir b/bin/ecompressdir index 7933322a3..c7572410e 100755 --- a/bin/ecompressdir +++ b/bin/ecompressdir @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/emaint b/bin/emaint index 0f4f7b417..ab8e2a58e 100755 --- a/bin/emaint +++ b/bin/emaint @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # vim: noet : import os import re diff --git a/bin/emake b/bin/emake index 7fc8e7ea7..a5abf9c10 100755 --- a/bin/emake +++ b/bin/emake @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/emerge b/bin/emerge index 16ca57d29..6988d519d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright Gentoo Foundation 2006 # Portage Emerge bits # $Id$ diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 86982b77c..51be0d859 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/env-update b/bin/env-update index 53019b2fb..545367074 100755 --- a/bin/env-update +++ b/bin/env-update @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/env-update.sh b/bin/env-update.sh index f68af2a5f..ac3d293e0 100755 --- a/bin/env-update.sh +++ b/bin/env-update.sh @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/eprefixify b/bin/eprefixify index 8b9f773d3..835e785dc 100755 --- a/bin/eprefixify +++ b/bin/eprefixify @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/etc-update b/bin/etc-update index e554d4467..8eeb484c8 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py index 323600916..e775ff3a8 100755 --- a/bin/filter-bash-environment.py +++ b/bin/filter-bash-environment.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/find-requires b/bin/find-requires index 6c187558c..91951a8a5 100755 --- a/bin/find-requires +++ b/bin/find-requires @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/fix-db.py b/bin/fix-db.py index 5829412eb..aa2bd756e 100755 --- a/bin/fix-db.py +++ b/bin/fix-db.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/fixdbentries b/bin/fixdbentries index de5a73dbc..d4e288821 100755 --- a/bin/fixdbentries +++ b/bin/fixdbentries @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/fixpackages b/bin/fixpackages index 756da6126..381098081 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/fowners b/bin/fowners index 424add968..d71e62a8b 100755 --- a/bin/fowners +++ b/bin/fowners @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/fperms b/bin/fperms index cf28a2aab..88782d173 100755 --- a/bin/fperms +++ b/bin/fperms @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/glsa-check b/bin/glsa-check index 1e3533d1e..23565fc6f 100644 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # $Header: $ # This program is licensed under the GPL, version 2 diff --git a/bin/md5check.py b/bin/md5check.py index 0b8395078..5976c1434 100755 --- a/bin/md5check.py +++ b/bin/md5check.py @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/md5check.sh b/bin/md5check.sh index 354ea46fa..05cc59615 100755 --- a/bin/md5check.sh +++ b/bin/md5check.sh @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index deb51422a..01a9e0d63 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header$ diff --git a/bin/newbin b/bin/newbin index 4e4a9aaf0..b45dd8497 100755 --- a/bin/newbin +++ b/bin/newbin @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newconfd b/bin/newconfd index c898c3479..9ce6d4069 100755 --- a/bin/newconfd +++ b/bin/newconfd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newdoc b/bin/newdoc index 4e4da01f2..8b41093f4 100755 --- a/bin/newdoc +++ b/bin/newdoc @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newenvd b/bin/newenvd index feea56ab7..ece766bf3 100755 --- a/bin/newenvd +++ b/bin/newenvd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newexe b/bin/newexe index e7b65f005..6bd52418c 100755 --- a/bin/newexe +++ b/bin/newexe @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newinitd b/bin/newinitd index dc017c934..5ab06d3af 100755 --- a/bin/newinitd +++ b/bin/newinitd @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newins b/bin/newins index f6ba21b8c..a0e58bed8 100755 --- a/bin/newins +++ b/bin/newins @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newlib.a b/bin/newlib.a index 3a745ebea..f26abfbcb 100755 --- a/bin/newlib.a +++ b/bin/newlib.a @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newlib.so b/bin/newlib.so index 84bffc733..558bc2fc0 100755 --- a/bin/newlib.so +++ b/bin/newlib.so @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newman b/bin/newman index d686767a0..5273fc64c 100755 --- a/bin/newman +++ b/bin/newman @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/newsbin b/bin/newsbin index e030e1fce..74acaf170 100755 --- a/bin/newsbin +++ b/bin/newsbin @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/pemerge.py b/bin/pemerge.py index c73cdbe10..8a578e7b6 100755 --- a/bin/pemerge.py +++ b/bin/pemerge.py @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O import profile,time,sys,os sys.path = ["@PORTAGE_BASE@/bin","@PORTAGE_BASE@/pym"]+sys.path diff --git a/bin/pkgname b/bin/pkgname index e50b35352..1d3637194 100755 --- a/bin/pkgname +++ b/bin/pkgname @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh index 2d8b4d29f..b878b80f7 100755 --- a/bin/portage_gpg_update.sh +++ b/bin/portage_gpg_update.sh @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/portageq b/bin/portageq index e5b36bbbc..3acba5079 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepall b/bin/prepall index 009ac6db2..dfaacfd3c 100755 --- a/bin/prepall +++ b/bin/prepall @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepalldocs b/bin/prepalldocs index 4da754b92..6dbdaa848 100755 --- a/bin/prepalldocs +++ b/bin/prepalldocs @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepallinfo b/bin/prepallinfo index 844816451..6bd2f619f 100755 --- a/bin/prepallinfo +++ b/bin/prepallinfo @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepallman b/bin/prepallman index a411d18b3..353b31f35 100755 --- a/bin/prepallman +++ b/bin/prepallman @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepallstrip b/bin/prepallstrip index 787e18aba..6787f7a7d 100755 --- a/bin/prepallstrip +++ b/bin/prepallstrip @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepinfo b/bin/prepinfo index cfb8fc799..f294a3c60 100755 --- a/bin/prepinfo +++ b/bin/prepinfo @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/preplib b/bin/preplib index 3c6e3b0b5..dafd77662 100755 --- a/bin/preplib +++ b/bin/preplib @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepman b/bin/prepman index 59abffe6c..ced966240 100755 --- a/bin/prepman +++ b/bin/prepman @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/prepstrip b/bin/prepstrip index 5b7a865db..8d8dceba9 100755 --- a/bin/prepstrip +++ b/bin/prepstrip @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/quickpkg b/bin/quickpkg index 419e40f96..44b1a4f39 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/regenworld b/bin/regenworld index fe88a2410..4c831a01d 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@PORTAGE_PYTHON@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/repoman b/bin/repoman index 66eed48b7..0eec50d6c 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/sed b/bin/sed index fb0148023..cc92ff13e 100755 --- a/bin/sed +++ b/bin/sed @@ -1,4 +1,4 @@ -#!@BASH@ +#!@PORTAGE_BASH@ # Copyright 2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/bin/xpak b/bin/xpak index 0a714fa8f..c41c18449 100755 --- a/bin/xpak +++ b/bin/xpak @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/configure.in b/configure.in index 6ea9037e5..0ffb90b24 100644 --- a/configure.in +++ b/configure.in @@ -38,13 +38,12 @@ AC_PATH_PROG(MV, [mv], no) AC_PATH_PROG(BASENAME, [basename], no) AC_PATH_PROG(DIRNAME, [dirname], no) dnl avoid bash internal variable messing up things here -unset BASH -GENTOO_PATH_GNUPROG(BASH, [bash]) -GENTOO_PATH_GNUPROG(SED, [sed]) -GENTOO_PATH_GNUPROG(WGET, [wget]) -GENTOO_PATH_GNUPROG(FIND, [find]) -GENTOO_PATH_GNUPROG(XARGS, [xargs]) -GENTOO_PATH_GNUPROG(GREP, [grep]) +GENTOO_PATH_GNUPROG(PORTAGE_BASH, [bash]) +GENTOO_PATH_GNUPROG(PORTAGE_SED, [sed]) +GENTOO_PATH_GNUPROG(PORTAGE_WGET, [wget]) +GENTOO_PATH_GNUPROG(PORTAGE_FIND, [find]) +GENTOO_PATH_GNUPROG(PORTAGE_XARGS, [xargs]) +GENTOO_PATH_GNUPROG(PORTAGE_GREP, [grep]) dnl Checks for header files. AC_HEADER_STDC diff --git a/pym/Makefile.in b/pym/Makefile.in index 742eed4b7..4629a86e3 100644 --- a/pym/Makefile.in +++ b/pym/Makefile.in @@ -2,7 +2,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ sysconfdir = @sysconfdir@ libdir = @libdir@ -PYTHON = @PYTHON@ +PYTHON = @PORTAGE_PYTHON@ srcdir=@srcdir@ top_builddir=@top_builddir@ diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index d3121aaa9..4a9b9c572 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1,4 +1,4 @@ -#!@PYTHON@ -O +#!@PORTAGE_PYTHON@ -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/subst-install.in b/subst-install.in index 2d45d88b6..bc50065ed 100644 --- a/subst-install.in +++ b/subst-install.in @@ -1,6 +1,6 @@ -#! @SHELL@ +#!@BASH@ -SED="@SED@" +SED="@PORTAGE_SED@" RM="@RM@" BASENAME="@BASENAME@" DIRNAME="@DIRNAME@" diff --git a/subst-install.vars.in.in b/subst-install.vars.in.in deleted file mode 100644 index 149e44b35..000000000 --- a/subst-install.vars.in.in +++ /dev/null @@ -1,133 +0,0 @@ -SHELL=@SHELL@ -PATH_SEPARATOR=@PATH_SEPARATOR@ -PACKAGE_NAME=@PACKAGE_NAME@ -PACKAGE_TARNAME=@PACKAGE_TARNAME@ -PACKAGE_VERSION=@PACKAGE_VERSION@ -PACKAGE_STRING=@PACKAGE_STRING@ -PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@ -exec_prefix=@exec_prefix@ -prefix=@prefix@ -program_transform_name=@program_transform_name@ -bindir=@bindir@ -sbindir=@sbindir@ -libexecdir=@libexecdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ -sharedstatedir=@sharedstatedir@ -localstatedir=@localstatedir@ -libdir=@libdir@ -includedir=@includedir@ -oldincludedir=@oldincludedir@ -infodir=@infodir@ -mandir=@mandir@ -build_alias=@build_alias@ -host_alias=@host_alias@ -target_alias=@target_alias@ -DEFS=@DEFS@ -ECHO_C=@ECHO_C@ -ECHO_N=@ECHO_N@ -ECHO_T=@ECHO_T@ -LIBS=@LIBS@ -build=@build@ -build_cpu=@build_cpu@ -build_vendor=@build_vendor@ -build_os=@build_os@ -host=@host@ -host_cpu=@host_cpu@ -host_vendor=@host_vendor@ -host_os=@host_os@ -target=@target@ -target_cpu=@target_cpu@ -target_vendor=@target_vendor@ -target_os=@target_os@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_SCRIPT=@INSTALL_SCRIPT@ -INSTALL_DATA=@INSTALL_DATA@ -CYGPATH_W=@CYGPATH_W@ -PACKAGE=@PACKAGE@ -VERSION=@VERSION@ -ACLOCAL=@ACLOCAL@ -AUTOCONF=@AUTOCONF@ -AUTOMAKE=@AUTOMAKE@ -AUTOHEADER=@AUTOHEADER@ -MAKEINFO=@MAKEINFO@ -AMTAR=@AMTAR@ -install_sh=@install_sh@ -STRIP=@STRIP@ -ac_ct_STRIP=@ac_ct_STRIP@ -INSTALL_STRIP_PROGRAM=@INSTALL_STRIP_PROGRAM@ -mkdir_p=@mkdir_p@ -AWK=@AWK@ -SET_MAKE=@SET_MAKE@ -am__leading_dot=@am__leading_dot@ -CC=@CC@ -CFLAGS=@CFLAGS@ -LDFLAGS=@LDFLAGS@ -CPPFLAGS=@CPPFLAGS@ -ac_ct_CC=@ac_ct_CC@ -EXEEXT=@EXEEXT@ -OBJEXT=@OBJEXT@ -DEPDIR=@DEPDIR@ -am__include=@am__include@ -am__quote=@am__quote@ -AMDEP_TRUE=@AMDEP_TRUE@ -AMDEP_FALSE=@AMDEP_FALSE@ -AMDEPBACKSLASH=@AMDEPBACKSLASH@ -CCDEPMODE=@CCDEPMODE@ -am__fastdepCC_TRUE=@am__fastdepCC_TRUE@ -am__fastdepCC_FALSE=@am__fastdepCC_FALSE@ -LN_S=@LN_S@ -EGREP=@EGREP@ -XCU_ID=@XCU_ID@ -RM=@RM@ -MV=@MV@ -SED=@SED@ -BASH=@BASH@ -PYTHON=@PYTHON@ -PERL=@PERL@ -BASENAME=@BASENAME@ -DIRNAME=@DIRNAME@ -DIALOG=@DIALOG@ -WGET=@WGET@ -INSTALL_INFO=@INSTALL_INFO@ -SANDBOX=@SANDBOX@ -PRELINK=@PRELINK@ -RSYNC=@RSYNC@ -CVS=@CVS@ -SVN=@SVN@ -GPG=@GPG@ -MD5SUM=@MD5SUM@ -LOGGER=@LOGGER@ -FIND=@FIND@ -FILE=@FILE@ -READELF=@READELF@ -SETFILES=@SETFILES@ -FAKEROOT=@FAKEROOT@ -CPP=@CPP@ -ALLOCA=@ALLOCA@ -portageuser=@portageuser@ -portagegroup=@portagegroup@ -wheelgid=@wheelgid@ -rootuser=@rootuser@ -DOMAIN_PREFIX=@DOMAIN_PREFIX@ -ARCH=@ARCH@ -PORTAGE_BASE=@PORTAGE_BASE@ -INSTALL_PYTHON_SOURCES_TRUE=@INSTALL_PYTHON_SOURCES_TRUE@ -INSTALL_PYTHON_SOURCES_FALSE=@INSTALL_PYTHON_SOURCES_FALSE@ -BUILD_TBZ2TOOL_TRUE=@BUILD_TBZ2TOOL_TRUE@ -BUILD_TBZ2TOOL_FALSE=@BUILD_TBZ2TOOL_FALSE@ -BUILD_MISSINGOS_TRUE=@BUILD_MISSINGOS_TRUE@ -BUILD_MISSINGOS_FALSE=@BUILD_MISSINGOS_FALSE@ -LIBOBJS=@LIBOBJS@ -LTLIBOBJS=@LTLIBOBJS@ -configure_input=@configure_input@ -srcdir=@srcdir@ -abs_srcdir=@abs_srcdir@ -top_srcdir=@top_srcdir@ -abs_top_srcdir=@abs_top_srcdir@ -builddir=@builddir@ -abs_builddir=@abs_builddir@ -top_builddir=@top_builddir@ -abs_top_builddir=@abs_top_builddir@ -INSTALL=@INSTALL@ -all_configurevars=' SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP XCU_ID RM MV SED BASH PYTHON PERL BASENAME DIRNAME DIALOG WGET INSTALL_INFO SANDBOX PRELINK RSYNC CVS GPG MD5SUM LOGGER FIND FILE READELF SETFILES FAKEROOT CPP ALLOCA portageuser portagegroup wheelgid rootuser DOMAIN_PREFIX ARCH PORTAGE_BASE INSTALL_PYTHON_SOURCES_TRUE INSTALL_PYTHON_SOURCES_FALSE BUILD_TBZ2TOOL_TRUE BUILD_TBZ2TOOL_FALSE BUILD_MISSINGOS_TRUE BUILD_MISSINGOS_FALSE LIBOBJS LTLIBOBJS configure_input srcdir abs_srcdir top_srcdir abs_top_srcdir builddir abs_builddir top_builddir abs_top_builddir INSTALL' diff --git a/tarball.sh b/tarball.sh index c1d079965..f1d67afff 100755 --- a/tarball.sh +++ b/tarball.sh @@ -14,7 +14,7 @@ export TMP="/var/tmp" export V="$1" export DEST="${TMP}/${PKG}-${V}" -./tabcheck.py `grep "#\!@PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'` +./tabcheck.py `grep "#\!@PORTAGE_PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'` if [ -e ${DEST} ]; then echo EXISTS ALREADY