From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SCYAz-0000lE-Es for garchives@archives.gentoo.org; Tue, 27 Mar 2012 15:19:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1826E045E; Tue, 27 Mar 2012 15:19:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AFA6EE045E for ; Tue, 27 Mar 2012 15:19:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E83B7641F7 for ; Tue, 27 Mar 2012 15:19:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B2893E5402 for ; Tue, 27 Mar 2012 15:19:03 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1332861508.8c1ba902154aee09b1c240d5a7a541dcafb46e6c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: /, bin/ X-VCS-Repository: proj/portage X-VCS-Files: Makefile bin/emerge-webrsync X-VCS-Directories: / bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8c1ba902154aee09b1c240d5a7a541dcafb46e6c X-VCS-Branch: master Date: Tue, 27 Mar 2012 15:19:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a657649c-6d0e-46e1-b014-4e0911f0b5fa X-Archives-Hash: fd18f87dd3d538f5b4eb44a0b3c9387b commit: 8c1ba902154aee09b1c240d5a7a541dcafb46e6c Author: Zac Medico gentoo org> AuthorDate: Tue Mar 27 14:39:57 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 27 15:18:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D8c1ba902 emerge-webrsync: use portageq from same prefix --- Makefile | 5 +++-- bin/emerge-webrsync | 12 ++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 697198e..c49cc66 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,9 @@ DIRMODE =3D 0755 SYSCONFDIR_FILES =3D etc-update.conf dispatch-conf.conf PORTAGE_CONFDIR_FILES =3D make.globals LOGROTATE_FILES =3D elog-save-summary -BINDIR_FILES =3D ebuild egencache emerge portageq quickpkg repoman -SBINDIR_FILES =3D archive-conf dispatch-conf emaint emerge-webrsync \ +BINDIR_FILES =3D ebuild egencache emerge emerge-webrsync \ + portageq quickpkg repoman +SBINDIR_FILES =3D archive-conf dispatch-conf emaint \ env-update etc-update fixpackages regenworld DOCS =3D ChangeLog NEWS RELEASE-NOTES =20 diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index e6749f2..bfd9aa2 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 ; } =20 argv0=3D$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=3D${BASH_SOURCE[0]} +if [ -x "${scriptpath%/*}/portageq" ]; then + portageq=3D${scriptpath%/*}/portageq +elif type -P portageq > /dev/null ; then + portageq=3Dportageq +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)