diff options
| author |   fuzzyray <fuzzyray@gentoo.org> | 2010-11-23 22:05:12 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2010-11-23 22:05:12 +0000 |
| commit | 071d31bf34bde3a0ba70833c9f899cc4310e1a3a (patch) | |
| tree | 7cc8178b9a87d0727b08679a781e225d3b1de45b | |
| parent | Update euse to look for /etc/portage/make.conf as well as /etc/make.conf. Bug... (diff) | |
| download | gentoolkit-071d31bf34bde3a0ba70833c9f899cc4310e1a3a.tar.gz gentoolkit-071d31bf34bde3a0ba70833c9f899cc4310e1a3a.tar.bz2 gentoolkit-071d31bf34bde3a0ba70833c9f899cc4310e1a3a.zip | |
Revert previous changes to euse, changes will need to be more extensive
svn path=/trunk/gentoolkit/; revision=867
| -rwxr-xr-x | bin/euse | 21 |
1 files changed, 7 insertions, 14 deletions
@@ -9,20 +9,7 @@ PROGRAM_NAME=euse VERSION="svn" -error() { - echo "ERROR: ${1}" - set +f - exit 1 -} - -# Portage now supports make.conf in /etc and /etc/portage -if [ -r /etc/make.conf ]; then - MAKE_CONF_PATH=/etc/make.conf -elif [ -r /etc/portage/make.conf ]; then - MAKE_CONF_PATH=/etc/portage/make.conf -else - error "make.conf file is not readable" -fi +MAKE_CONF_PATH=/etc/make.conf MAKE_GLOBALS_PATH=/etc/make.globals MAKE_PROFILE_PATH=/etc/make.profile MAKE_CONF_BACKUP_PATH=/etc/make.conf.euse_backup @@ -62,6 +49,12 @@ parse_arguments() { done } +error() { + echo "ERROR: ${1}" + set +f + exit 1 +} + get_real_path() { set -P cd "$1" |