commit: a8c6055ad7ff5a27ad92037e8f3af5a33996bbd0
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Fri Jun 20 00:17:36 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 20 05:45:36 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a8c6055a
emerge-webrsync: declare variables importable from portageq as an array
Some variables are brought into existence by evaluating the output of
portageq as shellcode. Have the names of these variables be contained by
an array variable named 'portage_vars'. This yields a minor improvement
in legibility.
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/emerge-webrsync | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 4e04f3af12..c451e02134 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -632,13 +632,27 @@ if ! portageq=$(PATH=${BASH_SOURCE%/*}:${PATH} type -P
portageq); then
die "could not find 'portageq'; aborting"
fi
-eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
- FETCHCOMMAND GENTOO_MIRRORS \
- PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
- PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \
- PORTAGE_RSYNC_OPTS PORTAGE_TEMP_GPG_DIR PORTAGE_TMPDIR \
- PORTAGE_USERNAME PORTAGE_GRPNAME \
- USERLAND http_proxy https_proxy ftp_proxy)"
+portage_vars=(
+ FETCHCOMMAND
+ GENTOO_MIRRORS
+ PORTAGE_BIN_PATH
+ PORTAGE_CONFIGROOT
+ PORTAGE_GPG_DIR
+ PORTAGE_GRPNAME
+ PORTAGE_NICENESS
+ PORTAGE_REPOSITORIES
+ PORTAGE_RSYNC_EXTRA_OPTS
+ PORTAGE_RSYNC_OPTS
+ PORTAGE_TEMP_GPG_DIR
+ PORTAGE_TMPDIR
+ PORTAGE_USERNAME
+ USERLAND
+ ftp_proxy
+ http_proxy
+ https_proxy
+)
+
+eval "$("${portageq}" envvar -v "${portage_vars[@]}")"
export http_proxy https_proxy ftp_proxy
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
