Skip to content

AK: Add an OptionalBase helper, and allow specializing Optional with dedicated empty values #25894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
7 changes: 4 additions & 3 deletions Meta/build-image-extlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC these don't fail in CI, but only in the pre-commit check, because we only pass the changed scripts to shellcheck, which doesn't include shell_include.sh.

So most (if not all) # shellcheck source=/dev/null we already have in master might be unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well it failed CI without the one in this exact file you point out....

Copy link
Member

@spholz spholz Apr 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, I have no idea why it fails here then.
I'm 99% sure that the build-image-raspberry-pi.sh one only failed in the pre-commit hook.

. "${script_path}/shell_include.sh"

if [ "$(id -u)" != 0 ]; then
Expand All @@ -30,7 +31,7 @@ for dir in "/usr/lib/syslinux/bios" "/usr/lib/syslinux" "/usr/share/syslinux"; d
break
fi
done
if [ -z $syslinux_dir ]; then
if [ -z "$syslinux_dir" ]; then
echo "can't find syslinux directory"
exit 1
fi
Expand Down Expand Up @@ -96,7 +97,7 @@ mkdir -p mnt/boot/extlinux
extlinux --install mnt/boot/extlinux
cp "$extlinux_cfg" mnt/boot/extlinux/extlinux.conf
for module in mboot.c32 menu.c32 libutil.c32 libcom32.c32; do
cp $syslinux_dir/$module mnt/boot/extlinux/
cp "$syslinux_dir/$module" mnt/boot/extlinux/
done
dd bs=440 count=1 conv=notrunc if=$syslinux_dir/mbr.bin of="$dev"
dd bs=440 count=1 conv=notrunc if="$syslinux_dir/mbr.bin" of="$dev"
echo "done"
1 change: 1 addition & 0 deletions Meta/build-image-grub-uefi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
. "${script_path}/shell_include.sh"

if [ "$(id -u)" != 0 ]; then
Expand Down
1 change: 1 addition & 0 deletions Meta/build-image-grub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
. "${script_path}/shell_include.sh"

if [ "$(id -u)" != 0 ]; then
Expand Down
1 change: 1 addition & 0 deletions Meta/build-image-limine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
. "${script_path}/shell_include.sh"

if [ ! -d "limine" ]; then
Expand Down
1 change: 1 addition & 0 deletions Meta/build-image-raspberry-pi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
. "${script_path}/shell_include.sh"

DISK_SIZE=$(($(disk_usage "$SERENITY_SOURCE_DIR/Base") + $(disk_usage Root) + 512 + 300))
Expand Down
1 change: 1 addition & 0 deletions Meta/build-native-partition.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

# shellcheck source=/dev/null
. "${script_path}/shell_include.sh"

cleanup() {
Expand Down