Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General: Cleanup build scripts

Browse Source
This commit is contained in:
Bananymous
2024-08-22 14:23:16 +03:00
parent fb35f06cf5
commit e59772a58d
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
script/image-create.sh
View File

@@ -63,4 +63,4 @@ sudo mkfs.ext2 -q $PARTITION2
sudo losetup -d $LOOP_DEV
# install bootloader
$BANAN_SCRIPT_DIR/install-bootloader.sh
$BANAN_SCRIPT_DIR/install-bootloader.sh || exit 1

2
script/image.sh
View File

@@ -16,7 +16,7 @@ if [ -z $BANAN_BUILD_DIR ]; then
fi
if [ "$1" == "full" ] || [ ! -f $BANAN_DISK_IMAGE_PATH ]; then
$BANAN_SCRIPT_DIR/image-create.sh
$BANAN_SCRIPT_DIR/image-create.sh || exit 1
fi
set -u

7
script/install-bootloader.sh
View File

@@ -62,9 +62,8 @@ install_grub_uefi() {
}
install_banan_legacy() {
ROOT_PARTITION_INDEX=2
ROOT_PARTITION_INFO=$(fdisk -x $BANAN_DISK_IMAGE_PATH | grep "^$BANAN_DISK_IMAGE_PATH" | head -$ROOT_PARTITION_INDEX | tail -1)
ROOT_PARTITION_GUID=$(echo $ROOT_PARTITION_INFO | cut -d' ' -f6)
ROOT_DISK_INFO=$(fdisk -x "$BANAN_DISK_IMAGE_PATH" | tr -s ' ')
ROOT_PART_GUID=$(echo "$ROOT_DISK_INFO" | grep "^$BANAN_DISK_IMAGE_PATH" | head -2 | tail -1 | cut -d' ' -f6)
INSTALLER_BUILD_DIR=$BANAN_ROOT_DIR/bootloader/installer/build/$BANAN_ARCH
BOOTLOADER_ELF=$BANAN_BUILD_DIR/bootloader/bios/bootloader
@@ -84,7 +83,7 @@ install_banan_legacy() {
ninja
echo installing bootloader
$INSTALLER_BUILD_DIR/banan_os-bootloader-installer $BOOTLOADER_ELF $BANAN_DISK_IMAGE_PATH $ROOT_PARTITION_GUID
$INSTALLER_BUILD_DIR/banan_os-bootloader-installer "$BOOTLOADER_ELF" "$BANAN_DISK_IMAGE_PATH" "$ROOT_PART_GUID"
}
install_banan_uefi() {