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

[Ulrich Müller]

commit:     26bd466e1620c26adbfc78195a8f35475b49d57a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 06:48:42 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 06:48:42 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=26bd466e

emerge-webrsync: Avoid double slash when expanding EPREFIX

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 bin/emerge-webrsync        | 6 +++---
 misc/emerge-delta-webrsync | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 782a6052eb..99da05543a 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -25,7 +25,7 @@
 #
 
 # Opportunistically use gentoo-functions for nicer output
-functions_script="${EPREFIX:-/}/lib/gentoo/functions.sh"
+functions_script="${EPREFIX}/lib/gentoo/functions.sh"
 source "${functions_script}" || {
        echo "${argv0}: Could not source ${functions_script}!" 1>&2
 
@@ -272,7 +272,7 @@ check_file_signature_gemato() {
                if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
                        local key="${PORTAGE_GPG_KEY}"
                else
-                       local 
key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+                       local 
key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
                fi
 
                if [[ ! -f "${key}" ]] ; then
@@ -319,7 +319,7 @@ check_file_signature_gpg_unwrapped() {
                if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
                        local key="${PORTAGE_GPG_KEY}"
                else
-                       local 
key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+                       local 
key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
                fi
 
                if [[ ! -f "${key}" ]] ; then

diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync
index 610a03f8f7..12930a0a68 100755
--- a/misc/emerge-delta-webrsync
+++ b/misc/emerge-delta-webrsync
@@ -20,7 +20,7 @@
 #
 
 # Opportunistically use gentoo-functions for nicer output
-functions_script="${EPREFIX:-/}/lib/gentoo/functions.sh"
+functions_script="${EPREFIX}/lib/gentoo/functions.sh"
 source "${functions_script}" || {
        echo "${argv0}: Could not source ${functions_script}!" 1>&2
 
@@ -383,7 +383,7 @@ check_file_signature_gemato() {
                if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
                        local key="${PORTAGE_GPG_KEY}"
                else
-                       local 
key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+                       local 
key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
                fi
 
                if [[ ! -f "${key}" ]] ; then
@@ -430,7 +430,7 @@ check_file_signature_gpg_unwrapped() {
                if [[ -n ${PORTAGE_GPG_KEY} ]] ; then
                        local key="${PORTAGE_GPG_KEY}"
                else
-                       local 
key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc
+                       local 
key="${EPREFIX}/usr/share/openpgp-keys/gentoo-release.asc"
                fi
 
                if [[ ! -f "${key}" ]] ; then