[Git][archlinux/packaging/packages/electron23][main] 2 commits: Use rbash for generated script to reduce chance of anything going sideways

[Caleb Maclennan (@alerque)]

Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / 
electron23


Commits:
b64090fd by Caleb Maclennan at 2024-03-04T11:12:37+03:00
Use rbash for generated script to reduce chance of anything going sideways

- - - - -
c57d966f by Caleb Maclennan at 2024-03-04T11:37:20+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
=====================================
@@ -265,7 +265,7 @@ sha256sums=('SKIP'
             '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
             'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
             '547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845'
-            '1eebf52f298ffb0a5525fa64b28039a6a0b5d83c07c3457262c88e9cc4bb0451'
+            '3ae82375ba212c31fd4ba6f1fa4e2445eeca8eb8c952176131ad57c0258db224'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -449,7 +449,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
 
   (


=====================================
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/electron23/-/compare/cccd37003ebd2b91fb89530fb8938a8382693e09...c57d966fb589f6b8f398329f0e9fc8836aa19492

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/electron23/-/compare/cccd37003ebd2b91fb89530fb8938a8382693e09...c57d966fb589f6b8f398329f0e9fc8836aa19492
You're receiving this email because of your account on gitlab.archlinux.org.