revert 6251644, and partially 1bd9a35

in 6251644 the change to the makeflags sed also made it less specific, acting on lines matching "MAKEFLAGS" instead of "^#MAKEFLAGS". the change to the pacman color sed in 1bd9a35 once given the same correction only saves 1 character over the previous commit's more readable expression where "Color" appears twice, so it's reverted to that.
This commit is contained in:
i-c-u-p 2022-04-28 11:34:00 +00:00 committed by GitHub
parent d4045ac8d7
commit 911d412fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -199,10 +199,10 @@ newperms "%wheel ALL=(ALL) NOPASSWD: ALL"
# Make pacman colorful, concurrent downloads and Pacman eye-candy.
grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf
sed -i "/^#ParallelDownloads/s/=.*/= 5/;/Color$/s/^#//" /etc/pacman.conf
sed -i "/^#ParallelDownloads/s/=.*/= 5/;s/^#Color$/Color/" /etc/pacman.conf
# Use all cores for compilation.
sed -i "s/-j2/-j$(nproc)/;/MAKEFLAGS/s/^#//" /etc/makepkg.conf
sed -i "s/-j2/-j$(nproc)/;/^#MAKEFLAGS/s/^#//" /etc/makepkg.conf
manualinstall yay || error "Failed to install AUR helper."