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/7] 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/7] 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." From 231f3b21f5212362bd17309bdc1c80a6463d39b2 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 01:03:30 +0000 Subject: [PATCH 3/7] shorten paralleldownloads sed --- larbs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/larbs.sh b/larbs.sh index 94bef96..2e4c926 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/;/Color$/s/^#//" /etc/pacman.conf +sed -i "/^#ParallelDownloads/s/=.*/= 5/;/Color$/s/^#//" /etc/pacman.conf # Use all cores for compilation. sed -i "s/-j2/-j$(nproc)/;/MAKEFLAGS/s/^#//" /etc/makepkg.conf 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 4/7] 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." From b207fd3f758bcdddff27674ed3be36b6ff700d09 Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Wed, 25 May 2022 10:38:39 +0200 Subject: [PATCH 5/7] default group wheel ... --- larbs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/larbs.sh b/larbs.sh index 18622ae..b281ba3 100755 --- a/larbs.sh +++ b/larbs.sh @@ -57,7 +57,7 @@ preinstallmsg() { \ adduserandpass() { \ # Adds user `$name` with password $pass1. dialog --infobox "Adding user \"$name\"..." 4 50 - useradd -m -G wheel -s /bin/zsh "$name" >/dev/null 2>&1 || + useradd -m -g wheel -s /bin/zsh "$name" >/dev/null 2>&1 || usermod -a -G wheel "$name" && mkdir -p /home/"$name" && chown "$name":wheel /home/"$name" export repodir="/home/$name/.local/src"; mkdir -p "$repodir"; chown -R "$name":wheel "$(dirname "$repodir")" echo "$name:$pass1" | chpasswd From 4bc17da5489ef0959dcbb8dcea99b9fca1d71ef7 Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Wed, 25 May 2022 12:22:43 +0200 Subject: [PATCH 6/7] abook launches with a error without this directory --- larbs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/larbs.sh b/larbs.sh index 18622ae..cdeca79 100755 --- a/larbs.sh +++ b/larbs.sh @@ -235,6 +235,7 @@ systembeepoff # Make zsh the default shell for the user. chsh -s /bin/zsh "$name" >/dev/null 2>&1 sudo -u "$name" mkdir -p "/home/$name/.cache/zsh/" +sudo -u "$name" mkdir -p "/home/$name/.config/abook/" # dbus UUID must be generated for Artix runit. dbus-uuidgen > /var/lib/dbus/machine-id From 4b3fe796e1c4da1544c6179156b5e670da94329b Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Wed, 25 May 2022 12:22:57 +0200 Subject: [PATCH 7/7] mpd outputs a error due to playlists dir missing --- larbs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/larbs.sh b/larbs.sh index cdeca79..85564bf 100755 --- a/larbs.sh +++ b/larbs.sh @@ -236,6 +236,7 @@ systembeepoff chsh -s /bin/zsh "$name" >/dev/null 2>&1 sudo -u "$name" mkdir -p "/home/$name/.cache/zsh/" sudo -u "$name" mkdir -p "/home/$name/.config/abook/" +sudo -u "$name" mkdir -p "/home/$name/.config/mpd/playlists/" # dbus UUID must be generated for Artix runit. dbus-uuidgen > /var/lib/dbus/machine-id