Ignore comment lines in chromium-flags.conf and quote CHROMIUM_USER_FLAGS

3 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29112786c7f8..4e2c3060d9aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-snapshot-bin
 	pkgdesc = The open-source project behind Google Chrome (Latest Snapshot)
-	pkgver = 92.0.4511.0.r883389
+	pkgver = 92.0.4511.0.r883428
 	pkgrel = 1
 	url = https://build.chromium.org
 	install = chromium-snapshot-bin.install
@@ -18,7 +18,7 @@ pkgbase = chromium-snapshot-bin
 	optdepends = flashplugin: support for Flash content
 	optdepends = ttf-liberation: fix fonts for some PDFs [RBug #369991]
 	provides = chromium
-	source = chrome-linux-r883389.zip::https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/883389/chrome-linux.zip
+	source = chrome-linux-r883428.zip::https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/883428/chrome-linux.zip
 	source = chromium-snapshot-bin.sh
 	source = chromium-snapshot-bin.desktop
 	source = chromium-snapshot-bin_16.png
@@ -31,7 +31,7 @@ pkgbase = chromium-snapshot-bin
 	source = chromium-snapshot-bin_256.png
 	source = LICENSE
 	sha1sums = SKIP
-	sha1sums = a5a3e5e646d4cc22bd738c580609f2ad681b2ede
+	sha1sums = 12c3b365d3765ab8d049b517c3f598563ef0c45b
 	sha1sums = e64637c07b921f197fc1d7fd031c8a73ea3a55f8
 	sha1sums = 1cbdde48d193a648723f948370eff9b7b2fbf3f9
 	sha1sums = 97b440a273fd58543f62db639bdebc4d7a8029a5
diff --git a/PKGBUILD b/PKGBUILD
index e3d0cdafe6c7..0ff3957cfd3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributors: Det, Ner0, alexwizard, thotypous, jdhore, xduugu, randypenguin, bdheeman, AlK
 
 pkgname=chromium-snapshot-bin
-pkgver=92.0.4511.0.r883389
+pkgver=92.0.4511.0.r883428
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Latest Snapshot)"
 arch=('x86_64')
@@ -23,7 +23,7 @@ source=("chrome-linux-r$_build.zip::https://commondatastorage.googleapis.com/chr
         "$pkgname"_{16,22,24,32,48,64,128,256}.png
         'LICENSE')
 sha1sums=('SKIP'
-          'a5a3e5e646d4cc22bd738c580609f2ad681b2ede'
+          '12c3b365d3765ab8d049b517c3f598563ef0c45b'
           'e64637c07b921f197fc1d7fd031c8a73ea3a55f8'
           '1cbdde48d193a648723f948370eff9b7b2fbf3f9'
           '97b440a273fd58543f62db639bdebc4d7a8029a5'
diff --git a/chromium-snapshot-bin.sh b/chromium-snapshot-bin.sh
index 4bae1abd90b5..8e3bd76ad592 100644
--- a/chromium-snapshot-bin.sh
+++ b/chromium-snapshot-bin.sh
@@ -2,13 +2,13 @@
 
 # Allow users to override command-line options
 if [[ -f ~/.config/chromium-flags.conf ]]; then
-   CHROMIUM_USER_FLAGS="$(cat ~/.config/chromium-flags.conf)"
+   CHROMIUM_USER_FLAGS="$(grep -v '^#' ~/.config/chromium-flags.conf)"
 fi
 
 # Detect Pepper Flash
 if [[ -f /usr/lib/PepperFlash/libpepflashplayer.so ]]; then
   PepperVer="$(grep 'version' /usr/lib/PepperFlash/manifest.json | cut -d '"' -f4)"
-  CHROMIUM_USER_FLAGS+=" --ppapi-flash-path=/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version=$PepperVer"
+  PEPPERFLASH_FLAGS="--ppapi-flash-path=/usr/lib/PepperFlash/libpepflashplayer.so --ppapi-flash-version=$PepperVer"
 fi
 
 # Let the wrapped binary know that it has been run through the wrapper.
@@ -21,4 +21,4 @@ export GOOGLE_DEFAULT_CLIENT_ID=413772536636.apps.googleusercontent.com
 export GOOGLE_DEFAULT_CLIENT_SECRET=0ZChLK6AxeA3Isu96MkwqDR4
 
 # Launch
-exec /opt/chromium-snapshot/chrome $CHROMIUM_USER_FLAGS "$@"
+exec /opt/chromium-snapshot/chrome $PEPPERFLASH_FLAGS "$CHROMIUM_USER_FLAGS" "$@"