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

Split al specific base packages out from mainline base

Browse Source
This commit is contained in:
natemaia 2019-04-01 19:04:42 -07:00
parent 0d34b83974
commit 2b09b40877
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archlabs-installer
View File

@ -5,10 +5,10 @@
# Some ideas and code reworked from other resources # Some ideas and code reworked from other resources
# AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due
VER="2.0.29" # version VER="2.0.30" # installer version
DIST="ArchLabs" # distributor DIST="ArchLabs" # linux distributor
MNT="/mnt" # mountpoint MNT="/mnt" # install mountpoint
ANS="/tmp/ans" ANS="/tmp/ans" # dialog answer file
# --------------------------------------------- # # --------------------------------------------- #
@ -95,9 +95,11 @@ ISO_BASE+="pacman-contrib parted rsync sdparm smartmontools wget wireless_tools
ISO_BASE+="alsa-firmware alsa-lib alsa-plugins pulseaudio pulseaudio-alsa networkmanager w3m htop wireless-regdb " ISO_BASE+="alsa-firmware alsa-lib alsa-plugins pulseaudio pulseaudio-alsa networkmanager w3m htop wireless-regdb "
ISO_BASE+="wpa_supplicant lm_sensors lsb-release p7zip pamixer reflector unrar ranger terminus-font ttf-dejavu archlabs-keyring" ISO_BASE+="wpa_supplicant lm_sensors lsb-release p7zip pamixer reflector unrar ranger terminus-font ttf-dejavu archlabs-keyring"
# archlabs base packages
AL_BASE_PKGS="archlabs-skel-base archlabs-themes archlabs-dARK archlabs-icons archlabs-wallpapers"
# baseline (usually installed in the background) # baseline (usually installed in the background)
BASE_PKGS="archlabs-skel-base archlabs-themes archlabs-dARK archlabs-icons archlabs-wallpapers " BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 gtk-engines gtk-engine-murrine pavucontrol tumbler "
BASE_PKGS+="base-devel xorg xorg-drivers sudo git gvfs gtk3 gtk-engines gtk-engine-murrine pavucontrol tumbler "
BASE_PKGS+="playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot" BASE_PKGS+="playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot"
# extras for window managers # extras for window managers
@ -590,10 +592,14 @@ select_sessions()
(( WM_NUM++ )) (( WM_NUM++ ))
done <<< "$INSTALL_WMS" done <<< "$INSTALL_WMS"
WM_PKGS="${INSTALL_WMS/dwm/}" # remove dwm from package list WM_PKGS="${INSTALL_WMS/dwm/}" # remove dwm from package list
WM_PKGS="${WM_PKGS// / }" # remove double spaces WM_PKGS="${WM_PKGS// / }" # remove double spaces
WM_PKGS="${WM_PKGS# }" # remove leading space WM_PKGS="${WM_PKGS# }" # remove leading space
# add archlabs base when choosing any session
[[ $WM_PKGS ]] && WM_PKGS+=" $AL_BASE_PKGS"
for i in $INSTALL_WMS; do for i in $INSTALL_WMS; do
LOGIN_CHOICES+="$i - " LOGIN_CHOICES+="$i - "
[[ ${WM_EXT[$i]} && $WM_PKGS != *"${WM_EXT[$i]}"* ]] && WM_PKGS+=" ${WM_EXT[$i]}" [[ ${WM_EXT[$i]} && $WM_PKGS != *"${WM_EXT[$i]}"* ]] && WM_PKGS+=" ${WM_EXT[$i]}"
@ -604,6 +610,7 @@ select_sessions()
while IFS=' ' read -r pkg; do while IFS=' ' read -r pkg; do
[[ $PACKAGES != *"$pkg"* ]] && PACKAGES+=" $pkg" [[ $PACKAGES != *"$pkg"* ]] && PACKAGES+=" $pkg"
done <<< "$WM_PKGS" done <<< "$WM_PKGS"
return 0 return 0
} }