diff --git a/archlabs-installer b/archlabs-installer index 2b9b7ca..a64b791 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -14,7 +14,7 @@ # will result in "My Distro Linux" used where needed : ${DIST="ArchLabs"} -VER="2.0.64" # installer version +VER="2.0.65" # installer version MNT="/mnt" # install mountpoint ANS="/tmp/ans" # dialog answer file @@ -95,26 +95,24 @@ FORMATTED='' # partitions we formatted and should allow skipping AUTO_ROOT_PART='' # root value from auto partition AUTO_BOOT_PART='' # boot value from auto partition -# archlabs base -AL_BASE_PKGS="archlabs-skel-base archlabs-fonts archlabs-themes archlabs-dARK archlabs-icons archlabs-wallpapers archlabs-scripts" - -# baseline (usually installed in the background) -BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 gtk-engines gtk-engine-murrine pavucontrol tumbler xdg-user-dirs " -BASE_PKGS+="playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot" - -# extras for window managers -WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip exo laptop-detect " -WM_BASE_PKGS+="xdotool compton wmctrl gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings" - - SEL=0 # currently selected menu item ERR="/tmp/errlog" # error log used internally DBG="/tmp/debuglog" # debug log when passed -d RUN="/run/archiso/bootmnt/arch/boot" # path for live system /boot VM="$(dmesg | grep -i "hypervisor")" # system running in a virtual machine SYS='Unknown' # bios type to be determined: UEFI/BIOS +export DIALOGOPTS="--cr-wrap" # see `man dialog` -export DIALOGOPTS="--cr-wrap" # see `man dialog` +# baseline +BASE_PKGS="base-devel xorg xorg-drivers sudo git gvfs gtk3 gtk-engines gtk-engine-murrine pavucontrol tumbler xdg-user-dirs " +BASE_PKGS+="playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good scrot" + +# archlabs base +AL_BASE_PKGS="archlabs-skel-base archlabs-fonts archlabs-themes archlabs-icons archlabs-wallpapers archlabs-scripts" + +# extras for window managers +WM_BASE_PKGS="arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip exo laptop-detect " +WM_BASE_PKGS+="xdotool compton wmctrl gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings" # } @@ -2348,13 +2346,13 @@ live() select_keymap || { clear; die 0; } net_connect || { msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2; die 1; } trap - INT - pacman -Syyu --noconfirm || exit - pacman -S $AL_BASE_PKGS archlabs-skel-openbox openbox xterm xorg-xinit xorg-server --needed --noconfirm || exit + pacman -Syyu --noconfirm || die 1 + pacman -S $AL_BASE_PKGS $WM_BASE_PKGS archlabs-skel-openbox openbox xterm xorg-xinit xorg-server --needed --noconfirm || die 1 pacman -Scc --noconfirm # these get back some space rm -rf /var/cache/pacman/pkg/* - cp -rfT /etc/skel /root || exit + cp -rfT /etc/skel /root || die 1 startx - exit + die 0 } yesno()