From 00bfd437561bf84d7e797f1805e5994fc80c208d Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 18 Aug 2019 02:04:21 -0700 Subject: [PATCH] Move wm extra packages into skel packages depends list --- archlabs-installer | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/archlabs-installer b/archlabs-installer index 63b5557..0382ca6 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -5,7 +5,7 @@ # Some ideas and code reworked from other resources # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due -VER="2.0.48" # installer version +VER="2.0.49" # installer version DIST="ArchLabs" # linux distributor MNT="/mnt" # install mountpoint ANS="/tmp/ans" # dialog answer file @@ -161,17 +161,17 @@ declare -A WM_SESSIONS=( [cinnamon]='cinnamon-session' ) # } -# packages installed for each wm/de { +# packages installed for each wm/de, most are depends of the skel packages { declare -A WM_EXT=( [dwm]='' [gnome]='' [awesome]='awesome' [plasma]='kdebase-meta' -[bspwm]='sxhkd archlabs-skel-bspwm rofi archlabs-polybar' -[fluxbox]='archlabs-skel-fluxbox archlabs-polybar jgmenu rofi lxmenu-data' -[i3-gaps]='i3status perl-anyevent-i3 archlabs-skel-i3-gaps rofi archlabs-polybar' -[openbox]='obconf archlabs-skel-openbox jgmenu archlabs-polybar tint2 conky rofi lxmenu-data' -[xfce4]='xfce4-goodies xfce4-pulseaudio-plugin network-manager-applet volumeicon rofi archlabs-skel-xfce4' +[bspwm]='' +[fluxbox]='' +[i3-gaps]='' +[openbox]='' +[xfce4]='xfce4-goodies' ) # } # files that can be edited after install is complete { @@ -1473,7 +1473,7 @@ install_user() # root uses zsh by default, change it if something else was chosen chrun "usermod -s $MYSHELL root" 2>$ERR errshow 1 "usermod -s $MYSHELL root" - cp -fv $MNT/etc/skel/.mkshrc $MNT/root/.mkshrc + [[ $MYSHELL == '/usr/bin/mksh' ]] && cp -fv $MNT/etc/skel/.mkshrc $MNT/root/.mkshrc fi local groups='audio,autologin,floppy,log,network,rfkill,scanner,storage,optical,power,wheel'