diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | bin/emerge-webrsync | 12 |
2 files changed, 13 insertions, 4 deletions
@@ -29,8 +29,9 @@ DIRMODE = 0755 SYSCONFDIR_FILES = etc-update.conf dispatch-conf.conf PORTAGE_CONFDIR_FILES = make.globals LOGROTATE_FILES = elog-save-summary -BINDIR_FILES = ebuild egencache emerge portageq quickpkg repoman -SBINDIR_FILES = archive-conf dispatch-conf emaint emerge-webrsync \ +BINDIR_FILES = ebuild egencache emerge emerge-webrsync \ + portageq quickpkg repoman +SBINDIR_FILES = archive-conf dispatch-conf emaint \ env-update etc-update fixpackages regenworld DOCS = ChangeLog NEWS RELEASE-NOTES diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index e6749f285..bfd9aa2fc 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -27,11 +27,19 @@ wecho() { echo "${argv0}: warning: $*" 1>&2 ; } eecho() { echo "${argv0}: error: $*" 1>&2 ; } argv0=$0 -if ! type -P portageq > /dev/null ; then + +# Use portageq from the same directory/prefix as the current script, so +# that we don't have to rely on PATH including the current EPREFIX. +scriptpath=${BASH_SOURCE[0]} +if [ -x "${scriptpath%/*}/portageq" ]; then + portageq=${scriptpath%/*}/portageq +elif type -P portageq > /dev/null ; then + portageq=portageq +else eecho "could not find 'portageq'; aborting" exit 1 fi -eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ +eval $("${portageq}" envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ PORTAGE_BIN_PATH PORTAGE_GPG_DIR \ PORTAGE_NICENESS PORTAGE_RSYNC_EXTRA_OPTS PORTAGE_TMPDIR PORTDIR \ SYNC http_proxy ftp_proxy) |