Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / electron29
Commits: a14e3793 by Jan Alexander Steffens (heftig) at 2024-04-22T14:41:00+03:00 electron-launcher.sh: Prevent environment injection of flags or MAPFILE - - - - - bda6f061 by Jan Alexander Steffens (heftig) at 2024-04-22T14:41:03+03:00 electron-launcher.sh: Load electron-flags.conf as a fallback - - - - - 78ef99f6 by Caleb Maclennan at 2024-04-22T16:57:50+03:00 upgpkg: 29.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 = electron29 pkgdesc = Build cross platform desktop apps with web technologies pkgver = 29.3.1 - pkgrel = 1 + pkgrel = 2 url = https://electronjs.org arch = x86_64 license = MIT @@ -251,7 +251,7 @@ pkgbase = electron29 sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1 sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961 sha256sums = dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4 - sha256sums = b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c + sha256sums = b406bc9adb7fadcfbd26f204f3e0ef8c31a41fa09181edb28626167ac58fe038 sha256sums = 4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae sha256sums = 55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e sha256sums = 3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224 ===================================== PKGBUILD ===================================== @@ -10,7 +10,7 @@ pkgver=29.3.1 _gcc_patches=122-3 -pkgrel=1 +pkgrel=2 _major_ver=${pkgver%%.*} pkgname="electron${_major_ver}" pkgdesc='Build cross platform desktop apps with web technologies' @@ -235,7 +235,7 @@ sha256sums=('2060cc6181163deec42b38e367e87244b50155fe97fa2dd6908137f3887313c9' '3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1' 'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961' 'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4' - 'b0ac3422a6ab04859b40d4d7c0fd5f703c893c9ec145c9894c468fbc0a4d457c' + 'b406bc9adb7fadcfbd26f204f3e0ef8c31a41fa09181edb28626167ac58fe038' '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' '55dbe71dbc1f3ab60bf1fa79f7aea7ef1fe76436b1d7df48728a1f8227d2134e' '3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224' ===================================== 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/electron29/-/compare/b78322e94d7b779d9b9b7152e3ff9179c08dfe65...78ef99f60f29090ff73b1dd4059ee6d51ccc500d -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/electron29/-/compare/b78322e94d7b779d9b9b7152e3ff9179c08dfe65...78ef99f60f29090ff73b1dd4059ee6d51ccc500d You're receiving this email because of your account on gitlab.archlinux.org.