Merge pull request #445 from i-c-u-p/patch-5
fix ParallelDownloads regex, add -E for 2 seds, shorten pacman color regex
This commit is contained in:
commit
51d58e1260
4
larbs.sh
4
larbs.sh
@ -129,7 +129,7 @@ installationloop() { \
|
|||||||
aurinstalled=$(pacman -Qqm)
|
aurinstalled=$(pacman -Qqm)
|
||||||
while IFS=, read -r tag program comment; do
|
while IFS=, read -r tag program comment; do
|
||||||
n=$((n+1))
|
n=$((n+1))
|
||||||
echo "$comment" | grep -q "^\".*\"$" && comment="$(echo "$comment" | sed "s/\(^\"\|\"$\)//g")"
|
echo "$comment" | grep -q "^\".*\"$" && comment="$(echo "$comment" | sed -E "s/(^\"|\"$)//g")"
|
||||||
case "$tag" in
|
case "$tag" in
|
||||||
"A") aurinstall "$program" "$comment" ;;
|
"A") aurinstall "$program" "$comment" ;;
|
||||||
"G") gitmakeinstall "$program" "$comment" ;;
|
"G") gitmakeinstall "$program" "$comment" ;;
|
||||||
@ -199,7 +199,7 @@ newperms "%wheel ALL=(ALL) NOPASSWD: ALL"
|
|||||||
|
|
||||||
# Make pacman colorful, concurrent downloads and Pacman eye-candy.
|
# Make pacman colorful, concurrent downloads and Pacman eye-candy.
|
||||||
grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf
|
grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf
|
||||||
sed -i "/^#ParallelDownloads/s/=.*/= 5/;s/^#Color$/Color/" /etc/pacman.conf
|
sed -Ei "s/^#(ParallelDownloads).*/\1 = 5/;/^#Color$/s/#//" /etc/pacman.conf
|
||||||
|
|
||||||
# Use all cores for compilation.
|
# 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
|
||||||
|
Loading…
Reference in New Issue
Block a user