RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:24:57 +00:00
Code Issues Activity Actions

Meta: Pass -- to sudo instead of '$SHELL -c' in build scripts

Browse source 
fddbd11baa made it so the command executed
read `sh -c -- '"script" args*'`, the -- in this command is redundant as
the script name never starts with a dash and can never be interpreted as
an option or a flag.
The actually meaningful placement for -- here is after `$SUDO`, to make
sure `$SUDO` does not incorrectly treat `-c` as an option to itself, and
`$SHELL` cannot be interpreted as an option/flag in the extremely
unlikely event that it starts with a dash.
This commit is contained in:
Ali Mohammad Pur 2023-07-16 18:34:31 +03:30 • committed by Linus Groh
parent 3cbfd6382c
commit a720feba2f
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Meta/build-image-qemu.sh
View file

@ -12,7 +12,7 @@ if [ "$(id -u)" != 0 ]; then
USE_FUSE2FS=1
else
set +e
${SUDO} "${SHELL}" -c -- "\"$0\" $* || exit 42"
${SUDO} -- "${SHELL}" -c "\"$0\" $* || exit 42"
case $? in
1)
die "this script needs to run as root"
@ -70,7 +70,7 @@ nearest_power_of_2() {
echo $p
}
if [ "$SERENITY_ARCH" = "aarch64" ] || { [ -n "$SERENITY_USE_SDCARD" ] && [ "$SERENITY_USE_SDCARD" -eq 1 ]; }; then
# SD cards must have a size that is a power of 2. The Aarch64 port loads from an SD card.
# SD cards must have a size that is a power of 2. The Aarch64 port loads from an SD card.
DISK_SIZE_BYTES=$(nearest_power_of_2 "$DISK_SIZE_BYTES")
fi