Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-26 12:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

change defaults in Clover installer

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2022-05-07 19:07:27 +03:00
parent 8fc250a95c
commit 46a3f3c576
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CloverPackage/package/buildpkg.sh
View File

@ -1118,12 +1118,12 @@ if [[ -d "${SRCROOT}/CloverV2/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/File
if [[ $driver == VBoxHfs* ]]; then if [[ $driver == VBoxHfs* ]]; then
addChoice --group="FileSystem64UEFI" --title="$driverName" \ addChoice --group="FileSystem64UEFI" --title="$driverName" \
--start-selected="choicePreviouslySelected('$packageRefId')" \ --start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \
--selected="!choices['HFSPlus.UEFI'].selected" \ --selected="!choices['HFSPlus.UEFI'].selected" \
--pkg-refs="$packageRefId" "${driverName}" --pkg-refs="$packageRefId" "${driverName}"
else else
addChoice --group="FileSystem64UEFI" --title="$driverName" \ addChoice --group="FileSystem64UEFI" --title="$driverName" \
--start-selected="choicePreviouslySelected('$packageRefId')" \ --start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \
--selected="!choices['VBoxHfs.UEFI'].selected" \ --selected="!choices['VBoxHfs.UEFI'].selected" \
--pkg-refs="$packageRefId" "${driverName}" --pkg-refs="$packageRefId" "${driverName}"
fi fi
@ -1131,6 +1131,10 @@ if [[ -d "${SRCROOT}/CloverV2/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_UEFI/File
addChoice --group="FileSystem64UEFI" --title="$driverName" \ addChoice --group="FileSystem64UEFI" --title="$driverName" \
--start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \ --start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \
--pkg-refs="$packageRefId" "${driverName}" --pkg-refs="$packageRefId" "${driverName}"
elif [[ $driver == Fat* ]]; then
addChoice --group="FileSystem64UEFI" --title="$driverName" \
--start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \
--pkg-refs="$packageRefId" "${driverName}"
else else
addChoice --group="FileSystem64UEFI" --title="$driverName" \ addChoice --group="FileSystem64UEFI" --title="$driverName" \
--start-selected="choicePreviouslySelected('$packageRefId')" \ --start-selected="choicePreviouslySelected('$packageRefId')" \
@ -1358,7 +1362,7 @@ if [[ ${NOEXTRAS} != *"Clover Themes"* ]]; then
buildpackage "$packageRefId" "${themeName}" "${PKG_BUILD_DIR}/${themeName}" "${themeDestDir}" buildpackage "$packageRefId" "${themeName}" "${PKG_BUILD_DIR}/${themeName}" "${themeDestDir}"
# local selectTheme="checkFileExists('${themeDestDir}/$themeName/icons/func_clover.png')" # local selectTheme="checkFileExists('${themeDestDir}/$themeName/icons/func_clover.png')"
local selectTheme="choicePreviouslySelected('$packageRefId')" local selectTheme="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')"
# Select the default theme # Select the default theme
[[ "$themeName" == "$defaultTheme" ]] && selectTheme='true' [[ "$themeName" == "$defaultTheme" ]] && selectTheme='true'
addChoice --group="Themes" --start-selected="$selectTheme" --pkg-refs="$packageRefId" "${themeName}" addChoice --group="Themes" --start-selected="$selectTheme" --pkg-refs="$packageRefId" "${themeName}"

8
ebuild.sh
View File

@ -799,7 +799,7 @@ MainPostBuildScript() {
# Mandatory drivers # Mandatory drivers
echo "Copy Mandatory drivers:" echo "Copy Mandatory drivers:"
binArray=( FSInject XhciDxe SMCHelper AudioDxe ) binArray=( XhciDxe SMCHelper EnglishDxe )
for efi in "${binArray[@]}" for efi in "${binArray[@]}"
do do
copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_LEGACY/$efi.efi copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_LEGACY/$efi.efi
@ -811,7 +811,7 @@ MainPostBuildScript() {
copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_LEGACY/FileVault2/$efi.efi copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_LEGACY/FileVault2/$efi.efi
done done
binArray=( ApfsDriverLoader ) binArray=( ApfsDriverLoader FSInject )
for efi in "${binArray[@]}" for efi in "${binArray[@]}"
do do
copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_LEGACY/FileSystem/$efi.efi copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_OFF/$DRIVERS_LEGACY/FileSystem/$efi.efi
@ -823,7 +823,7 @@ MainPostBuildScript() {
# fi # fi
binArray=( FSInject SMCHelper AudioDxe ) binArray=( SMCHelper EnglishDxe )
for efi in "${binArray[@]}" for efi in "${binArray[@]}"
do do
copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_UEFI/$efi.efi copyBin "$BUILD_DIR_ARCH"/$efi.efi "$CLOVER_PKG_DIR"/EFI/CLOVER/drivers/$DRIVERS_UEFI/$efi.efi
@ -844,7 +844,7 @@ MainPostBuildScript() {
fi fi
# drivers64UEFI # drivers64UEFI
binArray=( CsmVideoDxe EnglishDxe EmuVariableUefi NvmExpressDxe OsxFatBinaryDrv PartitionDxe ) binArray=( CsmVideoDxe EmuVariableUefi NvmExpressDxe OsxFatBinaryDrv PartitionDxe AudioDxe )
for efi in "${binArray[@]}" for efi in "${binArray[@]}"
do do