Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages /
electron25
Commits:
02f7d4e7 by Caleb Maclennan at 2024-03-04T12:56:29+03:00
Use rbash for generated script to reduce chance of anything going sideways
- - - - -
2e891e6b by Caleb Maclennan at 2024-03-04T12:56:35+03:00
Always remove targets during source prep so build can run outside of chroots
- - - - -
15cec8ec by Caleb Maclennan at 2024-03-04T12:57:04+03:00
Setup nvchecker
- - - - -
3 changed files:
- + .nvchecker.toml
- PKGBUILD
- makepkg-source-roller.py
Changes:
=====================================
.nvchecker.toml
=====================================
@@ -0,0 +1,6 @@
+[electron25]
+source = "github"
+github = "electron/electron"
+prefix = "v"
+include_regex = "v25\\.\\d+\\.\\d+"
+use_max_tag = true
=====================================
PKGBUILD
=====================================
@@ -222,7 +222,7 @@ sha256sums=('SKIP'
'ff588a8a4fd2f79eb8a4f11cf1aa151298ffb895be566c57cc355d47f161f53f'
'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
'547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845'
- '1eebf52f298ffb0a5525fa64b28039a6a0b5d83c07c3457262c88e9cc4bb0451'
+ '3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224'
'SKIP'
'SKIP'
'SKIP'
@@ -406,7 +406,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
pushd src/electron
=====================================
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/electron25/-/compare/a1530c234f1154980447eed597d0e20c16a8a7d0...15cec8ec801f3efed845b2ae3ba1827579134d6f
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/electron25/-/compare/a1530c234f1154980447eed597d0e20c16a8a7d0...15cec8ec801f3efed845b2ae3ba1827579134d6f
You're receiving this email because of your account on gitlab.archlinux.org.
