From 2b09b40877f2de833d17c6d7632eddfc154a9387 Mon Sep 17 00:00:00 2001 From: natemaia Date: Mon, 1 Apr 2019 19:04:42 -0700 Subject: [PATCH] Split al specific base packages out from mainline base --- archlabs-installer | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/archlabs-installer b/archlabs-installer index 81e833e..ac16d42 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -5,10 +5,10 @@ # Some ideas and code reworked from other resources # AIF, Cnichi, Calamares, Arch Wiki.. Credit where credit is due -VER="2.0.29" # version -DIST="ArchLabs" # distributor -MNT="/mnt" # mountpoint -ANS="/tmp/ans" +VER="2.0.30" # installer version +DIST="ArchLabs" # linux distributor +MNT="/mnt" # install mountpoint +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+="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) -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" # extras for window managers @@ -590,10 +592,14 @@ select_sessions() (( WM_NUM++ )) done <<< "$INSTALL_WMS" + WM_PKGS="${INSTALL_WMS/dwm/}" # remove dwm from package list WM_PKGS="${WM_PKGS// / }" # remove double spaces 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 LOGIN_CHOICES+="$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 [[ $PACKAGES != *"$pkg"* ]] && PACKAGES+=" $pkg" done <<< "$WM_PKGS" + return 0 }