Skip to content

Commit 64b604d

Browse files
committed
Merge branch 'master' of github.com:LukeSmithxyz/LARBS
2 parents e719079 + 3c1e8da commit 64b604d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

static/larbs.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Luke's Auto Rice Boostrapping Script (LARBS)
3+
# Luke's Auto Rice Bootstrapping Script (LARBS)
44
# by Luke Smith <[email protected]>
55
# License: GNU GPLv3
66

@@ -45,7 +45,7 @@ welcomemsg() {
4545
}
4646

4747
getuserandpass() {
48-
# Prompts user for new username an password.
48+
# Prompts user for new username and password.
4949
name=$(whiptail --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit 1
5050
while ! echo "$name" | grep -q "^[a-z_][a-z0-9_-]*$"; do
5151
name=$(whiptail --nocancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1)
@@ -304,7 +304,7 @@ adduserandpass || error "Error adding username and/or password."
304304
# in a fakeroot environment, this is required for all builds with AUR.
305305
trap 'rm -f /etc/sudoers.d/larbs-temp' HUP INT QUIT TERM PWR EXIT
306306
echo "%wheel ALL=(ALL) NOPASSWD: ALL
307-
Defaults:%wheel runcwd=*" >/etc/sudoers.d/larbs-temp
307+
Defaults:%wheel,root runcwd=*" >/etc/sudoers.d/larbs-temp
308308

309309
# Make pacman colorful, concurrent downloads and Pacman eye-candy.
310310
grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf
@@ -388,5 +388,8 @@ echo "Defaults editor=/usr/bin/nvim" >/etc/sudoers.d/02-larbs-visudo-editor
388388
mkdir -p /etc/sysctl.d
389389
echo "kernel.dmesg_restrict = 0" > /etc/sysctl.d/dmesg.conf
390390

391+
# Cleanup
392+
rm -f /etc/sudoers.d/larbs-temp
393+
391394
# Last message! Install complete!
392395
finalize

0 commit comments

Comments
 (0)