Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron28
Commits:
930c2a85 by Jan Alexander Steffens (heftig) at 2024-04-22T16:20:22+03:00
electron-launcher.sh: Prevent environment injection of flags or MAPFILE
- - - - -
def2b9ca by Jan Alexander Steffens (heftig) at 2024-04-22T16:20:24+03:00
electron-launcher.sh: Load electron-flags.conf as a fallback
- - - - -
18990d5c by Caleb Maclennan at 2024-04-22T19:45:09+03:00
upgpkg: 28.3.1-2: Rebuild with support for fallback flags in the launcher
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- electron-launcher.sh
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = electron28
pkgdesc = Build cross platform desktop apps with web technologies
pkgver = 28.3.1
- pkgrel = 1
+ pkgrel = 2
url = https://electronjs.org
arch = x86_64
license = MIT
@@ -249,7 +249,7 @@ pkgbase = electron28
sha256sums =
3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1
sha256sums =
b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
sha256sums =
dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4
- sha256sums =
b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c
+ sha256sums =
b406bc9adb7fadcfbd26f204f3e0ef8c31a41fa09181edb28626167ac58fe038
sha256sums =
4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae
sha256sums =
ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f
sha256sums =
55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e
=====================================
PKGBUILD
=====================================
@@ -10,7 +10,7 @@
pkgver=28.3.1
_gcc_patches=120
-pkgrel=1
+pkgrel=2
_major_ver=${pkgver%%.*}
pkgname="electron${_major_ver}"
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -233,7 +233,7 @@
sha256sums=('2cf56fd333c232cd5981afca682a8c15174a48dfdcb62aba7dd6ead6b52bc2f2'
'3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
- 'b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c'
+ 'b406bc9adb7fadcfbd26f204f3e0ef8c31a41fa09181edb28626167ac58fe038'
'4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae'
'ff9ebd86b0010e1c604d47303ab209b1d76c3e888c423166779cefbc22de297f'
'55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e'
=====================================
electron-launcher.sh
=====================================
@@ -4,14 +4,17 @@ set -euo pipefail
name=@ELECTRON@
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf"
+fallback_file="${XDG_CONFIG_HOME:-$HOME/.config}/electron-flags.conf"
-declare -a flags
-
+lines=()
if [[ -f "${flags_file}" ]]; then
- mapfile -t < "${flags_file}"
+ mapfile -t lines < "${flags_file}"
+elif [[ -f "${fallback_file}" ]]; then
+ mapfile -t lines < "${fallback_file}"
fi
-for line in "${MAPFILE[@]}"; do
+flags=()
+for line in "${lines[@]}"; do
if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
flags+=("${line}")
fi
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron28/-/compare/c0ccabd17dd5ad49c191b863af7dbd7e1d62ad6d...18990d5c1c53d6618cfd6dc814704a19e2efa396
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron28/-/compare/c0ccabd17dd5ad49c191b863af7dbd7e1d62ad6d...18990d5c1c53d6618cfd6dc814704a19e2efa396
You're receiving this email because of your account on gitlab.archlinux.org.
