make sure default shell gets selected and installed

https://github.com/Chrysostomus/manjaro-architect/issues/90
merge-requests/273/head
Bernhard Landauer 7 years ago
parent ccdd078e4c
commit 70a2a1b76b

@ -363,6 +363,7 @@ _InstDEMenuTitle="Vælg en komplet Manjaro udgave eller et skrivebords miljø ud
_InstGrMenuDS="Installer Display Server"
_InstGrMenuDSBody="I tillæg til xorg og wayland muligheder, er drivere til input enheder (xf86-input-) også medtaget."
_InstGrMenuDD="Installer Display Driver"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Installer Manjaro Skrivebord (stabile profiler)"
_InstDEGit="Installer Manjaro Skrivebord (udviklings profiler)"
_InstGrDE="Installer Skrivebords Miljø "

@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
_InstGrMenuDS="Installeer Weergave Manager"
_InstGrMenuDSBody="In aanvulling op Xorg en Wayland opties, zijn stuurprogramma's voor invoerapparaten (xf86-input) ook vermeld."
_InstGrMenuDD="Installeer Weergave Manager"
_WarnInstGr="No Display Driver selected." # translate me!
_InstDEStable="Install Manjaro Desktop (stable profiles)" # translate me!
_InstDEGit="Install Manjaro Desktop (development profiles)" # translate me!
_InstGrDE="Install Desktop environment" # translate me!

@ -485,12 +485,23 @@ create_new_user() {
USER=$(cat ${ANSWER})
done
shell=""
DIALOG " _NUsrTitle " --radiolist "\n$_DefShell\n$_UseSpaceBar" 0 0 3 \
"zsh" "-" on \
"bash" "-" off \
"fish" "-" off 2>/tmp/.shell
shell=$(cat /tmp/.shell)
case ${shell} in
"zsh") [[ ! -e /mnt/etc/skel/.zshrc ]] && basestrap ${MOUNTPOINT} manjaro-zsh-config
;;
"fish") [[ ! -e /usr/bin/fish ]] && basestrap ${MOUNTPOINT} fish
;;
"") shell="bash"
;;
esac
check_for_error "default shell: [${shell}]"
# Enter password. This step will only be reached where the loop has been skipped or broken.
DIALOG " $_ConfUsrNew " --clear --insecure --passwordbox "$_PassNUsrBody $USER\n\n" 0 0 \
2> ${ANSWER} || return 0

@ -257,7 +257,7 @@ edit_configs() {
done
;;
*) loopmenu=0
return 0
return 0
;;
esac

Loading…
Cancel
Save