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

Add lxqt as an option

Browse Source
This commit is contained in:
natemaia 2020-05-03 19:31:31 -07:00
parent fc7ae70f16
commit 27ca68f176
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
archlabs-installer
View File

@ -7,7 +7,7 @@
# shellcheck disable=SC2086,SC2046,SC2254 # shellcheck disable=SC2086,SC2046,SC2254
VER=2.1.42 VER=2.1.43
# default values { # default values {
@ -208,6 +208,7 @@ declare -A WM_SESSIONS=(
[gnome]='gnome-session' [gnome]='gnome-session'
[i3-gaps]='i3' [i3-gaps]='i3'
[jwm]='jwm' [jwm]='jwm'
[lxqt]='startlxqt'
[openbox]='openbox-session' [openbox]='openbox-session'
[plasma]='startplasma-x11' [plasma]='startplasma-x11'
[xfce4]='startxfce4' [xfce4]='startxfce4'
@ -224,6 +225,7 @@ declare -A WM_EXT=(
[gnome]='gnome-tweaks' [gnome]='gnome-tweaks'
[i3-gaps]='archlabs-skel-i3-gaps' [i3-gaps]='archlabs-skel-i3-gaps'
[jwm]='' [jwm]=''
[lxqt]='breeze-icons picom libpulse network-manager-applet'
[openbox]='archlabs-skel-openbox' [openbox]='archlabs-skel-openbox'
[plasma]='kde-applications-meta powerdevil' [plasma]='kde-applications-meta powerdevil'
[xfce4]='archlabs-skel-xfce4 xfce4-goodies' [xfce4]='archlabs-skel-xfce4 xfce4-goodies'
@ -464,7 +466,7 @@ select_login()
"xinit" "Console login with no graphical display manager" \ "xinit" "Console login with no graphical display manager" \
"lightdm" "Lightweight display manager (deepin and xfce default)" \ "lightdm" "Lightweight display manager (deepin and xfce default)" \
"gdm" "Gnome display manager (gnome default, go figure)" \ "gdm" "Gnome display manager (gnome default, go figure)" \
"sddm" "Simple desktop display manager (plasma default)" || return 1 "sddm" "Simple desktop display manager (plasma and lxqt default)" || return 1
case $LOGIN_TYPE in case $LOGIN_TYPE in
gdm|sddm) gdm|sddm)
@ -657,12 +659,15 @@ select_bootldr()
select_sessions() select_sessions()
{ {
typeset -a pkgs
LOGIN_CHOICES='' LOGIN_CHOICES=''
dlg INSTALL_WMS check "Sessions" "$_sessions\n" \ dlg INSTALL_WMS check "Sessions" "$_sessions\n" \
i3-gaps "A fork of i3wm with more features including gaps" "$(ofn i3-gaps "$INSTALL_WMS")" \ i3-gaps "A fork of i3wm with more features including gaps" "$(ofn i3-gaps "$INSTALL_WMS")" \
openbox "A lightweight, powerful, and highly configurable stacking wm" "$(ofn openbox "$INSTALL_WMS")" \ openbox "A lightweight, powerful, and highly configurable stacking wm" "$(ofn openbox "$INSTALL_WMS")" \
dwm "A dynamic WM for X that manages windows in tiled, floating, or monocle layouts" "$(ofn dwm "$INSTALL_WMS")" \ dwm "A dynamic WM for X that manages windows in tiled, floating, or monocle layouts" "$(ofn dwm "$INSTALL_WMS")" \
bspwm "A tiling wm that represents windows as the leaves of a binary tree" "$(ofn bspwm "$INSTALL_WMS")" \ bspwm "A tiling wm that represents windows as the leaves of a binary tree" "$(ofn bspwm "$INSTALL_WMS")" \
lxqt "A port of the lightweight desktop environment (LXDE) to Qt" "$(ofn lxqt "$INSTALL_WMS")" \
jwm "A lightweight window manager for Xorg written in C" "$(ofn jwm "$INSTALL_WMS")" \ jwm "A lightweight window manager for Xorg written in C" "$(ofn jwm "$INSTALL_WMS")" \
xfce4 "A lightweight and modular desktop environment based on gtk+2/3" "$(ofn xfce4 "$INSTALL_WMS")" \ xfce4 "A lightweight and modular desktop environment based on gtk+2/3" "$(ofn xfce4 "$INSTALL_WMS")" \
awesome "A customized Awesome WM session created by @elanapan" "$(ofn awesome "$INSTALL_WMS")" \ awesome "A customized Awesome WM session created by @elanapan" "$(ofn awesome "$INSTALL_WMS")" \
@ -675,7 +680,7 @@ select_sessions()
[[ $INSTALL_WMS ]] || return 0 [[ $INSTALL_WMS ]] || return 0
for i in ${INSTALL_WMS/dwm/}; do for i in ${INSTALL_WMS/dwm/}; do
USERWM_PKGS+=("$i") pkgs+=("$i")
done done
for i in $INSTALL_WMS; do for i in $INSTALL_WMS; do
@ -688,14 +693,14 @@ select_sessions()
fi fi
if [[ ${WM_EXT[$i]} ]]; then if [[ ${WM_EXT[$i]} ]]; then
for j in ${WM_EXT[$i]}; do for j in ${WM_EXT[$i]}; do
[[ ${USERWM_PKGS[*]} != *"$j"* ]] && USERWM_PKGS+=("$j") pkgs+=("$j")
done done
fi fi
done done
select_login || return 1 select_login || return 1
for pkg in "${USERWM_PKGS[@]}"; do for pkg in "${pkgs[@]}"; do
[[ ${SES_PKGS[*]} != *"$pkg"* ]] && SES_PKGS+=("$pkg") [[ ${SES_PKGS[*]} != *"$pkg"* ]] && SES_PKGS+=("$pkg")
done done
@ -1672,7 +1677,7 @@ install_cleanup()
[[ $LOGIN_WM == 'dwm' ]] && sed -i '/super/d; /picom/d' "$MNT/home/$user/.xprofile" "$MNT/root/.xprofile" [[ $LOGIN_WM == 'dwm' ]] && sed -i '/super/d; /picom/d' "$MNT/home/$user/.xprofile" "$MNT/root/.xprofile"
# remove some commands from ~/.xprofile when using self contained sessions # remove some commands from ~/.xprofile when using self contained sessions
if [[ $LOGIN_WM =~ ($SELF_CONTAINED_SES) || ($LOGIN_TYPE != 'xinit' && ${USERWM_PKGS[*]} =~ ($SELF_CONTAINED)) ]]; then if [[ $LOGIN_WM =~ ($SELF_CONTAINED_SES) || ($LOGIN_TYPE != 'xinit' && $INSTALL_WMS =~ ($SELF_CONTAINED)) ]]; then
sed -i '/super/d; /nitrogen/d; /picom/d' "$MNT/home/$user/.xprofile" "$MNT/root/.xprofile" sed -i '/super/d; /nitrogen/d; /picom/d' "$MNT/home/$user/.xprofile" "$MNT/root/.xprofile"
fi fi
@ -3057,6 +3062,9 @@ elif (( UID != 0 )); then
elif ! grep -qwm 1 'lm' /proc/cpuinfo; then elif ! grep -qwm 1 'lm' /proc/cpuinfo; then
msg "Not x86_64 Architecture" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2 msg "Not x86_64 Architecture" "\nThis installer only supports x86_64 architectures.\n\nExiting..\n" 2
die 1 die 1
elif [[ ! -d $MNT ]]; then
msg "No Mount Directory" "\nThe installer expects an existing directory for mounting.\n\nExiting..\n" 2
die 1
fi fi
# trap ^C to perform cleanup # trap ^C to perform cleanup