From 1bd9a35079fe4b3d7b5caa2bfde923e3efc785d1 Mon Sep 17 00:00:00 2001 From: i-c-u-p <96894903+i-c-u-p@users.noreply.github.com> Date: Wed, 27 Apr 2022 10:22:06 +0000 Subject: [PATCH 1/2] cleanup paralleldownloads regex because the pattern ends with ".*" the "$" is useless. also made the sed for uncommenting "Colors" slightly shorter by using "/$/s/^#//" instead of "s/^#$//" --- larbs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/larbs.sh b/larbs.sh index 365bdd6..510bf61 100755 --- a/larbs.sh +++ b/larbs.sh @@ -199,7 +199,7 @@ 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 "s/^#ParallelDownloads.*$/ParallelDownloads = 5/;s/^#Color$/Color/" /etc/pacman.conf +sed -i "s/^#ParallelDownloads.*/ParallelDownloads = 5/;/Color$/s/^#//" /etc/pacman.conf # Use all cores for compilation. sed -i "s/-j2/-j$(nproc)/;s/^#MAKEFLAGS/MAKEFLAGS/" /etc/makepkg.conf From 625164460be7190d74e13578a5fa84ea2f9bbe59 Mon Sep 17 00:00:00 2001 From: i-c-u-p <96894903+i-c-u-p@users.noreply.github.com> Date: Wed, 27 Apr 2022 11:50:19 +0000 Subject: [PATCH 2/2] shorten sed expr for uncommenting makeflags --- larbs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/larbs.sh b/larbs.sh index 510bf61..94bef96 100755 --- a/larbs.sh +++ b/larbs.sh @@ -202,7 +202,7 @@ grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" sed -i "s/^#ParallelDownloads.*/ParallelDownloads = 5/;/Color$/s/^#//" /etc/pacman.conf # Use all cores for compilation. -sed -i "s/-j2/-j$(nproc)/;s/^#MAKEFLAGS/MAKEFLAGS/" /etc/makepkg.conf +sed -i "s/-j2/-j$(nproc)/;/MAKEFLAGS/s/^#//" /etc/makepkg.conf manualinstall yay || error "Failed to install AUR helper."