From 1afcda04a7d0e7daf751a2a43b616cecd43cf91f Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Wed, 4 Mar 2026 22:20:15 +1000 Subject: [PATCH] www-client/chromium-common: add 2, drop 1 This commit updates the common wrapper script to accept CHROME_WRAPPER from the stub wrapper shipped with each Chromium channel. This was not being set properly in most cases, which was noticable in particular when trying to add new PWAs. Signed-off-by: Matt Jolly --- ...{chromium-common-1.ebuild => chromium-common-2.ebuild} | 0 www-client/chromium-common/files/chromium-launcher.sh | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) rename www-client/chromium-common/{chromium-common-1.ebuild => chromium-common-2.ebuild} (100%) diff --git a/www-client/chromium-common/chromium-common-1.ebuild b/www-client/chromium-common/chromium-common-2.ebuild similarity index 100% rename from www-client/chromium-common/chromium-common-1.ebuild rename to www-client/chromium-common/chromium-common-2.ebuild diff --git a/www-client/chromium-common/files/chromium-launcher.sh b/www-client/chromium-common/files/chromium-launcher.sh index e70bc4c3130a9..88150a9a20dc3 100644 --- a/www-client/chromium-common/files/chromium-launcher.sh +++ b/www-client/chromium-common/files/chromium-launcher.sh @@ -15,14 +15,12 @@ done # default CHROMIUM_FLAGS (from /etc/chromium/default). CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} -# We rely on the slotted stub to provide PROGDIR. -if [[ -z "${PROGDIR}" ]]; then - echo "ERROR: PROGDIR is not set. The Chromium launcher stub is misconfigured." >&2 +# We rely on the slotted stub to provide CHROME_WRAPPER. +if [[ -z "${CHROME_WRAPPER}" ]]; then + echo "ERROR: CHROME_WRAPPER is not set. The Chromium launcher stub is misconfigured." >&2 exit 1 fi -export CHROME_WRAPPER="${PROGDIR}/${CHROME_EXEC_NAME:-chromium-browser}" - PROGDIR=${CHROME_WRAPPER%/*} case ":$PATH:" in