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

Tweak shell choice at user creation

Browse Source
This commit is contained in:
Chrysostomus 2017-03-06 23:49:31 +08:00
parent f52044b726
commit 117ca4b2e1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util-base.sh
View File

@ -480,10 +480,12 @@ create_new_user() {
case ${shell} in case ${shell} in
"zsh") [[ ! -e /mnt/etc/skel/.zshrc ]] && basestrap ${MOUNTPOINT} manjaro-zsh-config "zsh") [[ ! -e /mnt/etc/skel/.zshrc ]] && basestrap ${MOUNTPOINT} manjaro-zsh-config
shell=/usr/bin/zsh
;; ;;
"fish") [[ ! -e /usr/bin/fish ]] && basestrap ${MOUNTPOINT} fish "fish") [[ ! -e /mnt/usr/bin/fish ]] && basestrap ${MOUNTPOINT} fish
shell=/usr/bin/fish
;; ;;
"") shell="bash" "*") shell="/bin/bash"
;; ;;
esac esac
check_for_error "default shell: [${shell}]" check_for_error "default shell: [${shell}]"
@ -516,7 +518,7 @@ create_new_user() {
# Create the user, set password, then remove temporary password file # Create the user, set password, then remove temporary password file
arch_chroot "groupadd ${USER}" arch_chroot "groupadd ${USER}"
arch_chroot "useradd ${USER} -m -g ${USER} -G wheel,storage,power,network,video,audio,lp -s /bin/$shell" 2>$ERR arch_chroot "useradd ${USER} -m -g ${USER} -G wheel,storage,power,network,video,audio,lp -s $shell" 2>$ERR
check_for_error "add user to groups" $? check_for_error "add user to groups" $?
echo -e "${PASSWD}\n${PASSWD}" > /tmp/.passwd echo -e "${PASSWD}\n${PASSWD}" > /tmp/.passwd
arch_chroot "passwd ${USER}" < /tmp/.passwd >/dev/null 2>$ERR arch_chroot "passwd ${USER}" < /tmp/.passwd >/dev/null 2>$ERR