REF use lowercase variable names like I'm supposed to

ENH make cpu go yaaaaaaay
This commit is contained in:
Nathan Dwarshuis 2021-03-13 18:18:01 -05:00
parent 3bdcd7181b
commit fa43a8d4f9
1 changed files with 21 additions and 21 deletions

View File

@ -14,29 +14,29 @@
## 6. remove the temporary HOME for yay ## 6. remove the temporary HOME for yay
## 7. remove the pacman sudo privilege for nobody ## 7. remove the pacman sudo privilege for nobody
PKGSRC_dir="$1" pkgsrc_dir="$1"
PKGBUILD_dir=/tmp/bootstrap-makepkg makepkg_tmp=/tmp/bootstrap-makepkg
YAYTMP=/tmp/bootstrap-yay yaytmp=/tmp/bootstrap-yay
NOBODY_SUDO="nobody ALL=(root) NOPASSWD: /usr/bin/pacman" nobody_sudo_conf="nobody ALL=(root) NOPASSWD: /usr/bin/pacman"
NOBODY_SUDO_CONF=/etc/sudoers.d/10-nobody-pacman nobody_sudo_path=/etc/sudoers.d/10-nobody-pacman
mk_nobody_perms() { mk_nobody_perms() {
echo "Giving user nobody permission to use pacman without password" echo "Giving user nobody permission to use pacman without password"
echo "$NOBODY_SUDO" > "$NOBODY_SUDO_CONF" echo "$nobody_sudo_conf" > "$nobody_sudo_path"
} }
mk_yaytmp() { mk_yaytmp() {
echo "Creating temporary build directory for yay at $YAYTMP" echo "Creating temporary build directory for yay at $yaytmp"
mkdir "$YAYTMP" mkdir "$yaytmp"
chown -R nobody:nobody "$YAYTMP" chown -R nobody:nobody "$yaytmp"
} }
mk_makepkg_dir() { mk_makepkg_dir() {
echo "Creating temporary makepkg build directory at $PKGBUILD_dir" echo "Creating temporary makepkg build directory at $makepkg_tmp"
mkdir -p "$PKGBUILD_dir" mkdir -p "$makepkg_tmp"
echo "Populated with packages from $PKGSRC_dir" echo "Populated with packages from $pkgsrc_dir"
cp -r "$PKGSRC_dir"/* "$PKGBUILD_dir" cp -r "$pkgsrc_dir"/* "$makepkg_tmp"
chown -R nobody:nobody "$PKGBUILD_dir" chown -R nobody:nobody "$makepkg_tmp"
} }
try_nobody_update() { try_nobody_update() {
@ -50,7 +50,7 @@ try_nobody_update() {
} }
call_makepkg() { call_makepkg() {
cd "$PKGBUILD_dir/$1" || return 1 cd "$makepkg_tmp/$1" || return 1
sudo -u nobody MAKEFLAGS="-j$(nproc)" makepkg -s -r -i -f --noconfirm sudo -u nobody MAKEFLAGS="-j$(nproc)" makepkg -s -r -i -f --noconfirm
} }
@ -77,7 +77,7 @@ run_yay() {
## AUR pkgs needed for spotify ## AUR pkgs needed for spotify
spotify_pkgs=(gconf) spotify_pkgs=(gconf)
sudo -u nobody HOME="$YAYTMP" \ sudo -u nobody HOME="$yaytmp" MAKEFLAGS="-j$(nproc)" \
yay --noconfirm --removemake -S \ yay --noconfirm --removemake -S \
"${dunst_pkgs[@]}" \ "${dunst_pkgs[@]}" \
"${emacs_pkgs[@]}" \ "${emacs_pkgs[@]}" \
@ -105,18 +105,18 @@ run_makepkg() {
} }
rm_makepkg_dir() { rm_makepkg_dir() {
echo "Removing temporary makepkg build directory at $PKGBUILD_dir" echo "Removing temporary makepkg build directory at $makepkg_tmp"
rm -r -f "$PKGBUILD_dir" rm -r -f "$makepkg_tmp"
} }
rm_yaytmp() { rm_yaytmp() {
echo "Removing temporary build directory for yay at $YAYTMP" echo "Removing temporary build directory for yay at $yaytmp"
rm -r -f "$YAYTMP" rm -r -f "$yaytmp"
} }
rm_nobody_perms() { rm_nobody_perms() {
echo "Removing user nobody's permission to use pacman without password" echo "Removing user nobody's permission to use pacman without password"
rm -f "$NOBODY_SUDO_CONF" rm -f "$nobody_sudo_path"
} }
clean_up() { clean_up() {