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

Add more info and better formatting to various lsblk outputs

Browse Source
This commit is contained in:
natemaia 2020-03-07 16:58:48 -08:00
parent 3455c4bfe9
commit 9bc60e09fd
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archlabs-installer
View File

@ -5,7 +5,7 @@
# Some ideas and code reworked from other resources # Some ideas and code reworked from other resources
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
VER=2.1.21 VER=2.1.22
# default values { # default values {
@ -187,7 +187,8 @@ main()
{ {
(( SEL < 13 )) && (( SEL++ )) (( SEL < 13 )) && (( SEL++ ))
tput civis tput civis
dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " --default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \ dialog --backtitle "$DIST Installer - $SYS - v$VER" --title " Prepare " \
--default-item $SEL --cancel-label 'Exit' --menu "$_prep" 0 0 0 \
1 "Show device tree" \ 1 "Show device tree" \
2 "Partitioning" \ 2 "Partitioning" \
3 "LUKS encryption" \ 3 "LUKS encryption" \
@ -283,7 +284,7 @@ select_login()
lightdm) lightdm)
LIGHTDM_GREETER='gtk-greeter' LIGHTDM_GREETER='gtk-greeter'
EDIT_FILES[login]="/etc/lightdm/lightdm.conf /etc/lightdm/lightdm-gtk-greeter.conf" EDIT_FILES[login]="/etc/lightdm/lightdm.conf /etc/lightdm/lightdm-gtk-greeter.conf"
local txt="\nBecause you chose to install deepin you can choose to use their greeter for lightdm\n\nUse the deepin greeter?\n" local txt="\nWith a deepin install you can choose to use their greeter for lightdm\n\nUse the deepin greeter?\n"
[[ $INSTALL_WMS == *deepin* ]] && yesno "Greeter" "$txt" && LIGHTDM_GREETER="deepin-greeter" [[ $INSTALL_WMS == *deepin* ]] && yesno "Greeter" "$txt" && LIGHTDM_GREETER="deepin-greeter"
;; ;;
xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile" xinit) EDIT_FILES[login]="/home/$NEWUSER/.xinitrc /home/$NEWUSER/.xprofile"
@ -595,11 +596,12 @@ part_menu()
while :; do while :; do
choice="" choice=""
dlg choice menu "Edit Partitions" "$_part\n\n$(lsblk -no NAME,MODEL,SIZE,TYPE,FSTYPE $device)" \ dlg choice menu "Edit Partitions" "$_part\n\n$(lsblk -no NAME,MODEL,SIZE,FSTYPE,LABEL $device)" \
"auto" "Whole device automatic partitioning" \ "auto" "Whole device automatic partitioning" \
"cfdisk" "Curses based variant of fdisk" \ "cfdisk" "Curses based variant of fdisk" \
"cgdisk" "Curses based variant of gdisk" \ "cgdisk" "Curses based variant of gdisk" \
"parted" "GNU partition editor" $([[ $DISPLAY ]] && hash gparted >/dev/null 2>&1 && printf "gparted 'A gui front end to parted'") \ "parted" "GNU partition editor" $([[ $DISPLAY ]] && hash gparted >/dev/null 2>&1 && printf \
"gparted 'A gui front end to parted'") \
"fdisk" "Dialog-driven creation and manipulation of partitions" \ "fdisk" "Dialog-driven creation and manipulation of partitions" \
"gdisk" "A text-mode partitioning tool that works on GUID Partition Table (GPT) disks" \ "gdisk" "A text-mode partitioning tool that works on GUID Partition Table (GPT) disks" \
"done" "Return to the main menu" "done" "Return to the main menu"
@ -641,9 +643,7 @@ part_menu()
part_show() part_show()
{ {
msg "Device Tree" "\n\n$( msg "Device Tree" "\n\n$(lsblk -o NAME,MODEL,SIZE,FSTYPE,MOUNTPOINT | awk '!'"/${IGNORE_DEV:-NONEXX}/")\n\n"
lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE,MOUNTPOINT | awk "!/${IGNORE_DEV:-NONEXX}/"' && /disk|part|lvm|crypt|NAME/'
)\n\n"
} }
part_auto() part_auto()
@ -1963,7 +1963,7 @@ lvm_create()
errshow 0 "lvcreate -l +100%FREE '$VGROUP' -n '$VNAME' >/dev/null" || return 1 errshow 0 "lvcreate -l +100%FREE '$VGROUP' -n '$VNAME' >/dev/null" || return 1
LVM='logical volume'; sleep 0.5 LVM='logical volume'; sleep 0.5
txt="\nDone, volume: $VGROUP-$VNAME (${VOLUME_SIZE:-${VGROUP_MB}MB}) has been created.\n" txt="\nDone, volume: $VGROUP-$VNAME (${VOLUME_SIZE:-${VGROUP_MB}MB}) has been created.\n"
msg "$_lvmnew (LV:$VOL_COUNT)" "$txt\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE $LVM_PARTS)\n" msg "$_lvmnew (LV:$VOL_COUNT)" "$txt\n$(lsblk -o NAME,SIZE $LVM_PARTS)\n"
return 0 return 0
} }
@ -2209,7 +2209,7 @@ luks_pass()
luks_show() luks_show()
{ {
sleep 0.5 sleep 0.5
msg "$_luksnew" "\nEncrypted partition ready for mounting.\n\n$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE "$LUKS_PART")\n\n" msg "$_luksnew" "\nEncrypted partition ready for mounting.\n\n$(lsblk -o NAME,SIZE,FSTYPE "$LUKS_PART")\n\n"
} }
luks_setup() luks_setup()
@ -2614,7 +2614,7 @@ system_devices()
{ {
IGNORE_DEV="$(lsblk -lno NAME,MOUNTPOINT | awk '/\/run\/archiso\/bootmnt/ {sub(/[1-9]/, ""); print $1}')" IGNORE_DEV="$(lsblk -lno NAME,MOUNTPOINT | awk '/\/run\/archiso\/bootmnt/ {sub(/[1-9]/, ""); print $1}')"
SYS_DEVS="$(lsblk -lno NAME,SIZE,TYPE | awk '/disk/ && !'"/${IGNORE_DEV:-NONEXX}/"' {print "/dev/" $1 " " $2}')" SYS_DEVS="$(lsblk -lno TYPE,PATH,SIZE,MODEL | awk '/disk/ && !'"/${IGNORE_DEV:-NONEXX}/"' {print $2, $3 "__" $4}')"
if [[ -z $SYS_DEVS ]]; then if [[ -z $SYS_DEVS ]]; then
msg "Device Error" "\nNo available devices...\n\nExiting..\n" 2 msg "Device Error" "\nNo available devices...\n\nExiting..\n" 2