[gentoo-commits] proj/portage:master commit in: bin/

[Sam James]

commit:     7fb887ba92c47ae9c065f50f1487c950dd44a5dc
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Tue Jul  1 19:45:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul  4 02:17:02 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=7fb887ba

emerge-webrsync: reformat slightly to conserve vertical real-estate

This commit applies some minor changes to both the sync_local() and
check_file_signature_gemato() functions, so as to be a little more
conservative as to the use of vertical screen real-estate.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/emerge-webrsync | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index ca99c92f1c..541ca8d001 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -262,16 +262,10 @@ check_file_signature_gemato() {
        local key
 
        assign_key
+       gemato_args=( openpgp-verify-detached -K "${key}" )
 
-       gemato_args=(
-               openpgp-verify-detached
-               -K "${key}"
-       )
-
-       if [[ -n ${http_proxy} || -n ${https_proxy} ]] ; then
-               gemato_args+=(
-                       --proxy "${http_proxy:-${https_proxy}}"
-               )
+       if [[ ${http_proxy} || ${https_proxy} ]]; then
+               gemato_args+=( --proxy "${http_proxy:-${https_proxy}}" )
        fi
 
        # PORTAGE_GPG_KEY_SERVER is directly exported by the webrsync module.
@@ -436,7 +430,6 @@ sync_local() {
                "${emerge}" --metadata
        fi
 
-       # --quiet suppresses output if there are no relevant news items
        if (( ! from_portage )) && contains_word news "${FEATURES}"; then
                "${emerge}" --check-news --quiet
        fi
@@ -464,8 +457,7 @@ do_snapshot() {
 
        read -rd '' -a mirrors <<<"${GENTOO_MIRRORS}"
 
-       for mirror in "${mirrors[@]}"; do
-               mirror=${mirror%/}
+       for mirror in "${mirrors[@]/%\/}"; do
                einfo "Trying to retrieve ${date} snapshot from ${mirror} ..."
                for file in "${tarballs[@]}"; do
                        digest="${file}.md5sum"