xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: missing default boot fallback directory name being empty when none exist

Browse Source
This commit is contained in:
natemaia 2018-12-16 22:10:52 -08:00
parent db9629d5cb
commit fda32f23e8
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals # immutable globals
readonly VER="1.7.45" # Installer version readonly VER="1.7.46" # Installer version
readonly DIST="ArchLabs" # Linux distributor readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log readonly ERR="/tmp/errlog" # Built-in error log

13
src/lib/boot.sh
View File

@ -233,12 +233,19 @@ uefi_boot_fallback()
# some UEFI firmware requires a dir in the ESP with a generic bootx64.efi # some UEFI firmware requires a dir in the ESP with a generic bootx64.efi
# see: https://wiki.archlinux.org/index.php/GRUB#UEFI # see: https://wiki.archlinux.org/index.php/GRUB#UEFI
local esp="${MNT}${BMNTS[UEFI-grub]}" local esp="${MNT}${BMNTS[$SYS-$BOOTLDR]}"
local default="boot"
local default
default="$(find $esp/EFI/ -maxdepth 1 -mindepth 1 -name '[Bb][oO][oO][tT]' -type d)" default="$(find $esp/EFI/ -maxdepth 1 -mindepth 1 -name '[Bb][oO][oO][tT]' -type d)"
default="$(basename $default)"
if [[ $default ]]; then
default="${default##/*}"
else
default="boot"
fi
printf "\n" printf "\n"
if [[ -d $esp/EFI/$default ]]; then if [[ -d $esp/EFI/$default ]]; then
rm -rfv $esp/EFI/$default/* rm -rfv $esp/EFI/$default/*
else else

2
src/lib/dialogs.sh
View File

@ -370,7 +370,7 @@ select_wm_or_de()
fi fi
# add packages to the main package list # add packages to the main package list
declare -g PACKAGES="$WM_PACKAGES" PACKAGES="$WM_PACKAGES"
} }
select_login() select_login()