Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-09 19:11:02 +00:00
Code Issues Projects Releases Wiki Activity

check_base before bootloader, highlight inst_base

Browse Source
This commit is contained in:
Bernhard Landauer 2017-03-05 03:08:10 +01:00
parent 472d0f19c3
commit bf4dd47dc2
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/util-base.sh
View File

@ -134,13 +134,14 @@ install_base() {
} }
install_bootloader() { install_bootloader() {
check_base && { if check_base; then
if [[ $SYSTEM == "BIOS" ]]; then if [[ $SYSTEM == "BIOS" ]]; then
bios_bootloader bios_bootloader
else else
uefi_bootloader uefi_bootloader
fi fi
} else
HIGHLIGHT_SUB=2
} }
uefi_bootloader() { uefi_bootloader() {

10
lib/util.sh
View File

@ -361,26 +361,20 @@ arch_chroot() {
check_mount() { check_mount() {
if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT}) == "" ]]; then if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT}) == "" ]]; then
DIALOG " $_ErrTitle " --msgbox "$_ErrNoMount" 0 0 DIALOG " $_ErrTitle " --msgbox "$_ErrNoMount" 0 0
ANSWER=0
HIGHLIGHT=0 HIGHLIGHT=0
return 1 return 1
else
return 0
fi fi
} }
# Ensure that Manjaro has been installed # Ensure that Manjaro has been installed
check_base() { check_base() {
check_mount && { if check_mount; then
if [[ ! -e /mnt/.base_installed ]]; then if [[ ! -e /mnt/.base_installed ]]; then
DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0 DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0
ANSWER=1
HIGHLIGHT=1 HIGHLIGHT=1
return 1 return 1
else
return 0
fi fi
} fi
} }
# install a pkg in the live session if not installed # install a pkg in the live session if not installed