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

Package changes

Browse Source
This commit is contained in:
natemaia 2020-07-01 18:54:29 -07:00
parent 903b757f57
commit 55ef4503a5
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
installer
View File

@ -6,7 +6,7 @@
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
# shellcheck disable=SC2086,SC2046,SC2254,SC2164 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
VER=2.1.61 VER=2.1.62
# default values { # default values {
@ -70,23 +70,8 @@ typeset -a BASE_PKGS=(
"scrot" "scrot"
"sudo" "sudo"
"xdg-user-dirs" "xdg-user-dirs"
"xorg"
"xorg-drivers" # TODO: should we only install specific drivers? "xorg-drivers" # TODO: should we only install specific drivers?
"xorg-font-utils"
"xorg-iceauth"
"xorg-server"
"xorg-server-common"
"xorg-setxkbmap"
"xorg-xauth"
"xorg-xbacklight"
"xorg-xinput"
"xorg-xkbcomp"
"xorg-xkill"
"xorg-xmodmap"
"xorg-xprop"
"xorg-xrandr"
"xorg-xrdb"
"xorg-xset"
"xorg-xsetroot"
"xterm" "xterm"
) # } ) # }
@ -2017,12 +2002,12 @@ install_packages()
if [[ $PACSTRAP -eq 1 ]]; then if [[ $PACSTRAP -eq 1 ]]; then
blk="$(lsblk -f)" blk="$(lsblk -f)"
lspci | grep -qi 'broadcom' && inpkg+=('b43-firmware' 'b43-fwcutter' 'broadcom-wl') lspci | grep -qi 'broadcom' && inpkg+=('b43-firmware' 'b43-fwcutter' 'broadcom-wl')
grep -qi 'ntfs' <<< "$blk" && inpkg+=('ntfs-3g') [[ $blk =~ ntfs ]] && inpkg+=('ntfs-3g')
grep -qi 'jfs' <<< "$blk" && inpkg+=('jfsutils') [[ $blk =~ jfs ]] && inpkg+=('jfsutils')
grep -qi 'xfs' <<< "$blk" && inpkg+=('xfsprogs') [[ $blk =~ xfs ]] && inpkg+=('xfsprogs')
grep -qi 'reiserfs' <<< "$blk" && inpkg+=('reiserfsprogs') [[ $blk =~ reiserfs ]] <<< "$blk" && inpkg+=('reiserfsprogs')
[[ $LVM ]] && inpkg+=('lvm2') [[ $LVM ]] && inpkg+=('lvm2')
if [[ $BTRFS_MNT ]] || grep -qi 'btrfs' <<< "$blk"; then if [[ $BTRFS_MNT ]] || [[ $blk =~ btrfs ]]; then
inpkg+=('btrfs-progs') inpkg+=('btrfs-progs')
fi fi
else else
@ -2052,7 +2037,7 @@ install_packages()
# check that packages were trying to install are available, slow as shit # check that packages were trying to install are available, slow as shit
# but I'm done doing this manually every time the arch repos change # but I'm done doing this manually every time the arch repos change
for pkg in "${inpkg[@]}"; do for pkg in "${inpkg[@]}"; do
if pacman -Qq $pkg >/dev/null 2>&1 || pacman -Ssq "^$pkg$" >/dev/null 2>&1; then if pacman -Ssq "^$pkg$" >/dev/null 2>&1; then
goodinpkg+=("$pkg") goodinpkg+=("$pkg")
else else
echo "package missing or no longer available: $pkg -- ignoring" echo "package missing or no longer available: $pkg -- ignoring"