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

Tidy up some text

Browse Source
This commit is contained in:
natemaia 2020-05-17 19:06:24 -07:00
parent 86c9388485
commit 8d46a77b15
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
installer
View File

@ -386,7 +386,7 @@ main()
tput civis tput civis
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " \ dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " \
--default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \ --default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
1 "Storage device management" \ 1 "Storage management" \
2 "* Mount partitions" \ 2 "* Mount partitions" \
3 "* Select bootloader" \ 3 "* Select bootloader" \
4 "* Username and password" \ 4 "* Username and password" \
@ -416,7 +416,6 @@ main()
*) yesno "Exit" "\nUnmount partitions (if any) and exit the installer?\n" && die 0 *) yesno "Exit" "\nUnmount partitions (if any) and exit the installer?\n" && die 0
esac esac
fi fi
} }
select_show() select_show()
@ -851,26 +850,28 @@ select_packages()
dev_menu() dev_menu()
{ {
local txt="$1" local txt="$1"
local choice=''
local back="Return to the main menu" local back="Return to the main menu"
[[ $txt ]] && back="Return to mounting" [[ $txt ]] && back="Return to mounting"
while :; do while :; do
dlg DEVMNG_OPT menu "Device Management" "\nHere you can perform some operations to modify system storage devices.\nSelect an option from the list below to get started\n$txt" \ dlg choice menu "Device Management" \
"\nHere you can perform some operations to modify system storage devices.\nSelect an option from the list below to see more.\n$txt" \
'view' 'View the device tree output from lsblk' \ 'view' 'View the device tree output from lsblk' \
'part' 'Modify the partition layout of a device' \ 'part' 'Modify the partition layout of a device' \
'luks' 'Setup LUKS encryption on a partition or LVM' \ 'luks' 'Setup LUKS encryption on a partition or LVM' \
'lvm' 'Setup logical volume management on partition(s)' \ 'lvm' 'Setup logical volume management on partition(s)' \
'back' "$back" || return 0 'back' "$back" || return 0
if [[ $DEVMNG_OPT == 'back' ]]; then if [[ $choice == 'back' ]]; then
return 0 return 0
elif [[ -z $WARN && $DEVMNG_OPT != 'view' ]]; then elif [[ -z $WARN && $choice != 'view' ]]; then
msg "Data Warning" "$_warn" msg "Data Warning" "$_warn"
WARN=true WARN=true
fi fi
case $DEVMNG_OPT in case "$choice" in
'view') part_show ;; 'view') part_show ;;
'part') part_menu ;; 'part') part_menu && [[ "$AUTO_ROOT" ]] && return 0 ;;
'luks') luks_menu ;; 'luks') luks_menu ;;
'lvm') lvm_menu ;; 'lvm') lvm_menu ;;
esac esac
@ -884,8 +885,9 @@ dev_menu()
part_menu() part_menu()
{ {
is_bg_install || return 0
local device choice devhash local device choice devhash
is_bg_install || return 0
devhash="$(lsblk -f | base64)" devhash="$(lsblk -f | base64)"
umount_dir "$MNT" umount_dir "$MNT"
part_device || return 1 part_device || return 1