From 911d412fa551d488d58e6bf60e9a3709bbf2f690 Mon Sep 17 00:00:00 2001 From: i-c-u-p <96894903+i-c-u-p@users.noreply.github.com> Date: Thu, 28 Apr 2022 11:34:00 +0000 Subject: [PATCH] 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. --- larbs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/larbs.sh b/larbs.sh index 2e4c926..18622ae 100755 --- a/larbs.sh +++ b/larbs.sh @@ -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."