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

Fix: mistake in login selection which would cause false positive error

Browse Source
This commit is contained in:
natemaia 2019-01-18 22:49:13 -08:00
parent 6ce3e9aa7f
commit e1c706eb9d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/archlabs-installer
View File

@ -69,6 +69,7 @@ DBG="/tmp/debuglog" # debug log when passed -d
RUN="/run/archiso/bootmnt/arch/boot" # path for live /boot RUN="/run/archiso/bootmnt/arch/boot" # path for live /boot
BT="$DIST Installer - v$VER" # backtitle used for dialogs BT="$DIST Installer - v$VER" # backtitle used for dialogs
VM="$(dmesg | grep -i "hypervisor")" # is the system a vm VM="$(dmesg | grep -i "hypervisor")" # is the system a vm
SEL=0 # currently selected menu item
AUTO_ROOT_PART="" # values from auto partition AUTO_ROOT_PART="" # values from auto partition
AUTO_BOOT_PART="" AUTO_BOOT_PART=""
@ -215,9 +216,7 @@ declare -A FS_OPTS=(
main() main()
{ {
[[ $SEL ]] || SEL=0
(( SEL < 11 )) && (( SEL++ )) (( SEL < 11 )) && (( SEL++ ))
tput civis tput civis
SEL=$(dialog --cr-wrap --stdout --backtitle "$BT" \ SEL=$(dialog --cr-wrap --stdout --backtitle "$BT" \
--title " $_PrepTitle " --default-item $SEL \ --title " $_PrepTitle " --default-item $SEL \
@ -234,9 +233,7 @@ main()
"10" "$_PrepShow" \ "10" "$_PrepShow" \
"11" "$_PrepInstall") "11" "$_PrepInstall")
if [[ $WARN != true && $SEL =~ (2|5) ]]; then [[ $WARN != true && $SEL =~ (2|5) ]] && { WARN=true; msgbox "$_PrepTitle" "$_WarnMount"; }
WARN=true; msgbox "$_PrepTitle" "$_WarnMount"
fi
case $SEL in case $SEL in
1) device_tree ;; 1) device_tree ;;
@ -515,7 +512,7 @@ select_login()
"xinit" "Console login without a display manager" \ "xinit" "Console login without a display manager" \
"lightdm" "Lightweight display manager with a gtk greeter")" "lightdm" "Lightweight display manager with a gtk greeter")"
if [[ $LOGIN_TYPE ]]; then if [[ $LOGIN_TYPE == "" ]]; then
return 1 return 1
elif [[ $LOGIN_TYPE == 'lightdm' ]]; then elif [[ $LOGIN_TYPE == 'lightdm' ]]; then
WM_PACKAGES+=" lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice" WM_PACKAGES+=" lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings accountsservice"