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

Change root shell, more package install clean up

Browse Source
This commit is contained in:
natemaia 2018-12-14 00:19:42 -08:00
parent b307ab8bbd
commit c815cb7f02
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/dialogs.sh
View File

@ -49,13 +49,15 @@ declare -gA WM_SESSIONS=(
) )
# additional packages installed for the given window manager # additional packages installed for the given window manager
rp="rofi archlabs-polybar"
declare -gA WM_EXT=( declare -gA WM_EXT=(
[gnome]="gnome-extra" [gnome]="gnome-extra"
[bspwm]="sxhkd archlabs-skel-bspwm rofi archlabs-screenlock archlabs-polybar" [bspwm]="sxhkd archlabs-skel-bspwm $rp"
[i3-gaps]="i3status perl-anyevent-i3 archlabs-skel-i3-gaps rofi archlabs-screenlock archlabs-polybar" [i3-gaps]="i3status perl-anyevent-i3 archlabs-skel-i3-gaps $rp"
[openbox]="obconf archlabs-skel-openbox jgmenu tint2 conky $rp"
[xfce4]="xfce4-goodies xfce4-pulseaudio-plugin archlabs-skel-xfce4" [xfce4]="xfce4-goodies xfce4-pulseaudio-plugin archlabs-skel-xfce4"
[openbox]="archlabs-obkey obconf archlabs-kickshaw archlabs-oblogout jgmenu archlabs-skel-openbox tint2 archlabs-skippy-xd conky archlabs-screenlock rofi archlabs-paranoid archlabs-polybar"
) )
unset rp
# files the user can edit during the final stage of install # files the user can edit during the final stage of install
declare -gA EDIT_FILES=( declare -gA EDIT_FILES=(
@ -88,18 +90,18 @@ show_cfg()
Swap: ${SWAP_PART:-None} Swap: ${SWAP_PART:-None}
Size: ${SWAP_SIZE:-None} Size: ${SWAP_SIZE:-None}
Extra: ${EXTRA_MNTS:-${EXTRA_MNT:-None}}
Hooks: ${MKINIT_HOOKS:-None}
LVM: ${LVM:-None} LVM: ${LVM:-None}
LUKS: ${LUKS:-None} LUKS: ${LUKS:-None}
Extra Mounts: ${EXTRA_MNTS:-${EXTRA_MNT:-None}}
Mkinit Hooks: ${MKINIT_HOOKS:-None}
---------- BOOTLOADER CONFIGURATION ----------- ---------- BOOTLOADER CONFIGURATION -----------
Loader: ${BOOTLDR:-None} Bootloader: ${BOOTLDR:-None}
Mount: ${mnt:-None} Mountpoint: ${mnt:-None}
Command: ${cmd:-None} Command: ${cmd:-None}
------------ SYSTEM CONFIGURATION ------------- ------------ SYSTEM CONFIGURATION -------------
@ -110,13 +112,13 @@ show_cfg()
Timezone: ${ZONE:-None}/${SUBZONE:-None} Timezone: ${ZONE:-None}/${SUBZONE:-None}
------------ LOGIN CONFIGURATION -------------- ------------ USER CONFIGURATION --------------
User: ${NEWUSER:-None} User: ${NEWUSER:-None}
Shell: ${MYSHELL:-None} Shell: ${MYSHELL:-None}
Session: ${LOGIN_WM:-None} Session: ${LOGIN_WM:-None}
Autologin: ${AUTOLOGIN:-None} Autologin: ${AUTOLOGIN:-None}
Management: ${LOGIN_TYPE:-None} Login Method: ${LOGIN_TYPE:-None}
------------ PACKAGES AND MIRRORS ------------- ------------ PACKAGES AND MIRRORS -------------

1
src/lib/install.sh
View File

@ -178,6 +178,7 @@ create_user()
{ {
# set root password # set root password
chrun "chpasswd <<< 'root:$ROOT_PASS'" chrun "chpasswd <<< 'root:$ROOT_PASS'"
[[ $MYSHELL == *zsh ]] || chrun "usermod -s $MYSHELL root"
local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel' local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'