summaryrefslogtreecommitdiff
diff options
authorNathan Pratta Teodosio <nathan.teodosio@canonical.com>2022-11-16 14:41:42 -0300
committerNathan Pratta Teodosio <nathan.teodosio@canonical.com>2022-11-16 14:58:18 -0300
commit888bf73251e375ffd3e4b6ed381bc201ce30044c (patch)
treed874f2673f7358c577bce0032699d397421b4d86
parent7df4229e93981f5fa475c8fd98b68b74721a8588 (diff)
Revert "chromium.launcher: Make CHROMIUM_FLAGS an array"
This reverts commit 2acf4c641fdc4050439acfee814f21e4fb3462d8.
-rwxr-xr-xlauncher/chromium.launcher14
1 files changed, 6 insertions, 8 deletions
diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher
index 783fb36..e02b5a8 100755
--- a/launcher/chromium.launcher
+++ b/launcher/chromium.launcher
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Move an existing profile directory over to $SNAP_USER_COMMON, which is shared
# across revisions of the snap. This addresses profile corruption when the snap
@@ -110,17 +110,15 @@ if [ $WANT_HEADLESS -eq 0 ] ; then
fi
fi
-CHROMIUM_FLAGS+=(
- # Allows translation of pages in foreign languages.
- # Refer to https://bugs.archlinux.org/task/76268.
- --disable-features=TFLiteLanguageDetectionEnabled
-)
+# Allows translation of pages in foreign languages.
+# Refer to https://bugs.archlinux.org/task/76268.
+CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-features=TFLiteLanguageDetectionEnabled"
if [ $WANT_TEMP_PROFILE -eq 0 ] ; then
- exec "$SNAP/usr/lib/chromium-browser/chrome" --password-store=$PASSWORD_STORE "${CHROMIUM_FLAGS[@]}" "$@"
+ exec "$SNAP/usr/lib/chromium-browser/chrome" --password-store=$PASSWORD_STORE $CHROMIUM_FLAGS "$@"
else
TEMP_PROFILE=$(mktemp -d)
trap "rm -rf $TEMP_PROFILE" EXIT
# we can't exec here as we need to clean-up the temporary profile
- "$SNAP/usr/lib/chromium-browser/chrome" --user-data-dir=$TEMP_PROFILE --password-store=$PASSWORD_STORE "${CHROMIUM_FLAGS[@]}" "$@"
+ "$SNAP/usr/lib/chromium-browser/chrome" --user-data-dir=$TEMP_PROFILE --password-store=$PASSWORD_STORE $CHROMIUM_FLAGS "$@"
fi