From e075824eb00e15ee13a7ed2ac23d645a1fd9af83 Mon Sep 17 00:00:00 2001
From: LAbyOne <63520775+LAbyOne@users.noreply.github.com>
Date: Sun, 9 May 2021 16:10:47 +0200
Subject: [PATCH] Add files via upload

---
 CloverPackage/package/buildpkg.sh | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/CloverPackage/package/buildpkg.sh b/CloverPackage/package/buildpkg.sh
index 6f5a92c15..ddf2374cb 100755
--- a/CloverPackage/package/buildpkg.sh
+++ b/CloverPackage/package/buildpkg.sh
@@ -1386,36 +1386,60 @@ if [[ ${NOEXTRAS} != *"Clover Themes"* ]]; then
     done
 fi
 
-# build CloverThemeManager package
-#if [[ -d "${SRCROOT}"/CloverThemeManager && ${NOEXTRAS} != *"Clover Themes"* ]]; then
+## build CloverThemeManager package
+# if [[ -d "${SRCROOT}"/CloverThemeManager && ${NOEXTRAS} != *"Clover Themes"* ]]; then
 #    local CTM_Dir="${SRCROOT}"/CloverThemeManager
 #    local CTM_Dest='/Applications'
-
+# 
 #    packagesidentity="${clover_package_identity}".CTM.themes
 #    choiceId="CloverThemeManager"
 #    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
-
+# 
 #    ditto --noextattr --noqtn "$CTM_Dir"  \
 #     "${PKG_BUILD_DIR}/${choiceId}/Root/${CTM_Dest}"/
 #    addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
 #                       --subst="INSTALLER_CHOICE=$packageRefId"      \
 #                       CloverThemeManager
 #    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/"
-    # CloverThemeManager.app can update it-self,
-    # so there's no need to record the choice as 'previously selected'.
+#    # CloverThemeManager.app can update it-self,
+#    # so there's no need to record the choice as 'previously selected'.
 #    addChoice --group="Themes" --start-selected="false" \
 #              --start-enabled="checkFileExists('/Users')" \
 #              --start-visible="checkFileExists('/Users')" \
 #              --pkg-refs="$packageRefId" "${choiceId}"
-    # end CloverThemeManager package
-# End build theme packages
-#fi
+#    # end CloverThemeManager package
+## End build theme packages
+# fi
+
+# build BootLoaderChooser
+if [[ -d "${SRCROOT}"/BootLoaderChooser && ${NOEXTRAS} != *"BootLoaderChooser"* ]]; then
+    echo "===================== BootLoaderChooser ====================="
+    local BLC_Dir="${SRCROOT}"/BootLoaderChooser
+    local BLC_Dest='/EFI/BOOT'
+    
+    packagesidentity="$clover_package_identity"
+    choiceId="BootLoaderChooser"
+    packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
+    
+    ditto --noextattr --noqtn "$BLC_Dir"  \
+    "${PKG_BUILD_DIR}/${choiceId}/Root/${BLC_Dest}"/
+    addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
+                       --subst="INSTALLER_CHOICE=$packageRefId"      \
+                       BootLoaderChooser
+    buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/Private/tmp/EFIROOTDIR"
+        addChoice --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')"  \
+                  --pkg-refs="$packageRefId" "${choiceId}"
+    else
+        addChoice --start-visible="true" --start-selected="false"  \
+                  --pkg-refs="$packageRefId" "${choiceId}"
+# End BootLoaderChooser
+fi
 
 # build CloverConfigPlistValidator package
 if [[ -d "${SRCROOT}"/CloverConfigPlistValidator && ${NOEXTRAS} != *"CloverConfigPlistValidator"* ]]; then
    echo "=============== CloverConfigPlistValidator ==============="
    local CCPV_Dir="${SRCROOT}"/CloverConfigPlistValidator
-   local CCPV_Dest='/Applications/CloverUtils/CloverConfigPlistValidator'
+   local CCPV_Dest='/usr/local/bin'
    
    packagesidentity="${clover_package_identity}"
    choiceId="CloverConfigPlistValidator"