diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-12-21 01:53:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-21 01:53:54 +0000 |
| commit | 65d7e278ede743ad53c45805ecef74e08e4bd9b6 (patch) | |
| tree | 4bc76f6db2a579baeb3012c0a079d31f95eaaf65 /sys-devel/gcc-config/files | |
| parent | make sure ROOT always ends in a / (diff) | |
| download | gentoo-2-65d7e278ede743ad53c45805ecef74e08e4bd9b6.tar.gz gentoo-2-65d7e278ede743ad53c45805ecef74e08e4bd9b6.tar.bz2 gentoo-2-65d7e278ede743ad53c45805ecef74e08e4bd9b6.zip | |
fix the trailing / check for ROOT and silence grep if config doesnt exist
(Portage version: 2.0.53)
Diffstat (limited to 'sys-devel/gcc-config/files')
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.3.12 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.12 b/sys-devel/gcc-config/files/gcc-config-1.3.12 index fd1cbec0ddcb..2b08e80c2feb 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.12 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.12 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.10 2005/12/03 20:49:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.12,v 1.11 2005/12/21 01:53:54 vapier Exp $ trap ":" INT QUIT TSTP @@ -353,7 +353,7 @@ list_profiles() { eerror "$0: No gcc profile is active; please select one!" fi - eval $(grep ^CURRENT= "${GCC_ENV_D}"/config) + eval $(grep -s ^CURRENT= "${GCC_ENV_D}"/config) CURRENT_NATIVE=${CURRENT} local target= for x in "${GCC_ENV_D}"/* ; do @@ -501,7 +501,7 @@ FORCE="no" CC_COMP= [[ -z ${ROOT} ]] && ROOT="/" -[[ ${ROOT:-1} != "/" ]] && ROOT="${ROOT}/" +[[ ${ROOT:0-1} != "/" ]] && ROOT="${ROOT}/" ENV_D="${ROOT}etc/env.d" GCC_ENV_D="${ENV_D}/gcc" |