Skip to content

Commit

Permalink
Fix the build package (PKG) without using buildme
Browse files Browse the repository at this point in the history
  • Loading branch information
chris1111 committed Mar 24, 2024
1 parent 98c4841 commit 1e970b0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ Will replace your BOOTX64.efi, you can choose between several bootloader version
The first time, you'll get the menu. Choose one bootloader.
The next times, it'll immediately load the bootloader you chose before.
When you need the menu back, just boot your computer with a key pressed.
INSTALL ONLY FROM BUILDME !!!
INSTALL ONLY IF YOU KNOW WHAT YOU ARE DOING !!!
More infos https://github.com/jief666/BootloaderChooser. ";

Expand Down
11 changes: 9 additions & 2 deletions CloverPackage/package/buildpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,7 @@ fi
# build BootLoaderChooser
if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"* ]]; then
echo "===================== BootLoaderChooser ====================="
BLC_Dir="${SRCROOT}/BootLoaderChooser"
local BLC_Dir="${SRCROOT}"/BootLoaderChooser
local BLC_Dest='/EFI/BOOT'

Expand All @@ -1431,11 +1432,17 @@ if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"*
--subst="INSTALLER_CHOICE=$packageRefId" \
BootLoaderChooser
buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Private/tmp/EFIROOTDIR"

if [ -d "$BLC_Dir" ]; then
addChoice --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')" \
--pkg-refs="$packageRefId" "${choiceId}"
else
addChoice --start-visible="true" --start-selected="false" \
echo " **** Option usable with buildme only ****"
else

addChoice --start-visible="false" --start-selected="false" \
--pkg-refs="$packageRefId" "${choiceId}"
fi

# End BootLoaderChooser
fi

Expand Down

0 comments on commit 1e970b0

Please sign in to comment.