Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / electron26
Commits: 5461af25 by Caleb Maclennan at 2024-03-04T12:58:20+03:00 Use rbash for generated script to reduce chance of anything going sideways - - - - - 7e66139a by Caleb Maclennan at 2024-03-04T12:58:55+03:00 Always remove targets during source prep so build can run outside of chroots - - - - - 2 changed files: - PKGBUILD - makepkg-source-roller.py Changes: ===================================== PKGBUILD ===================================== @@ -222,7 +222,7 @@ sha256sums=('SKIP' '1808df5ba4d1e2f9efa07ac6b510bec866fa6d60e44505d82aea3f6072105a71' '893bc04c7fceba2f0a7195ed48551d55f066bbc530ec934c89c55768e6f3949c' 'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f' - '1eebf52f298ffb0a5525fa64b28039a6a0b5d83c07c3457262c88e9cc4bb0451' + '3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224' 'SKIP' 'SKIP' 'SKIP' @@ -410,7 +410,7 @@ prepare() { echo "Putting together electron sources" # Generate gclient gn args file and prepare-electron-source-tree.sh python makepkg-source-roller.py generate electron/DEPS $pkgname - bash prepare-electron-source-tree.sh "$CARCH" + rbash prepare-electron-source-tree.sh "$CARCH" mv electron src/electron echo "Running hooks..." ===================================== makepkg-source-roller.py ===================================== @@ -215,7 +215,7 @@ def generate_source_list(deps, indent, extra_sources, pkgname, reverse_map): def generate_managed_scripts(deps, extra_cmds, pkgname, reverse_map): - script = """#!/bin/bash + script = """#!/usr/bin/env rbash set -e # Generated file. Do not modify by hand. # Usage: script <CARCH> @@ -225,8 +225,8 @@ place_subproject_into_tree () { if [[ -n "$parent_dir" ]]; then mkdir -p "$parent_dir" fi - # Remove the target dir only if it's empty - rm -df "$2" + # Remove the target dir + rm -rf "$2" if [[ "$3" == "true" ]]; then cp -r "$1" "$2" else View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/electron26/-/compare/f7cd5b9fa1ba49483db1ccfe1975180878e0d3fd...7e66139a9e920ee00ae664228b5bf88adfa9c854 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/electron26/-/compare/f7cd5b9fa1ba49483db1ccfe1975180878e0d3fd...7e66139a9e920ee00ae664228b5bf88adfa9c854 You're receiving this email because of your account on gitlab.archlinux.org.