summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-14 19:40:04 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-14 19:40:04 +0000
commit1d1c255156f8ee2b16159bf9fa83990cae21d8c3 (patch)
treefb93e9d9e0def8eee361e3f5620e1c96d8615f20
parent3db59f45c7dbd877d3fd5d1be0ea03cc371014da (diff)
downloadportage-1d1c255156f8ee2b16159bf9fa83990cae21d8c3.tar.gz
portage-1d1c255156f8ee2b16159bf9fa83990cae21d8c3.tar.bz2
portage-1d1c255156f8ee2b16159bf9fa83990cae21d8c3.zip
Use eval $(portageq envvar -v FOO BAR) to collapse many portageq calls into 1.
svn path=/main/trunk/; revision=4257
-rwxr-xr-xbin/emerge-webrsync15
1 files changed, 6 insertions, 9 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 5305c4d14..ea7e8b359 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -5,22 +5,19 @@
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
# Rewritten from the old, Perl-based emerge-webrsync script
+eval $(/usr/lib/portage/bin/portageq envvar -v FEATURES FETCHCOMMAND \
+ GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS PORTDIR \
+ USERLAND)
+DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
+
# If PORTAGE_NICENESS is overriden via the env then it will
# still pass through the portageq call and override properly.
-PORTAGE_NICENESS="$(/usr/lib/portage/bin/portageq envvar PORTAGE_NICENESS)"
if [ -n "${PORTAGE_NICENESS}" ]; then
renice $PORTAGE_NICENESS $$ > /dev/null
fi
source /usr/lib/portage/bin/isolated-functions.sh || exit 1
-FEATURES="$(/usr/lib/portage/bin/portageq envvar FEATURES)"
-GENTOO_MIRRORS="${GENTOO_MIRRORS} $(/usr/lib/portage/bin/portageq gentoo_mirrors)"
-PORTDIR="$(/usr/lib/portage/bin/portageq portdir)"
-FETCHCOMMAND="$(/usr/lib/portage/bin/portageq envvar FETCHCOMMAND)"
-USERLAND="$(/usr/lib/portage/bin/portageq envvar USERLAND)"
-DISTDIR="$(/usr/lib/portage/bin/portageq envvar PORTAGE_TMPDIR)/emerge-webrsync"
-PORTAGE_INST_UID="$(/usr/lib/portage/bin/portageq envvar PORTAGE_INST_UID)"
-PORTAGE_INST_GID="$(/usr/lib/portage/bin/portageq envvar PORTAGE_INST_GID)"
+
if [ ! -d $DISTDIR ] ; then
mkdir -p $DISTDIR
fi