ndwarshuis
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX cleaning errors

This commit is contained in:
Nathan Dwarshuis 2021-03-13 17:05:36 -05:00
parent e2faf4bc50
commit 212aec5d66
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dot_bin/executable_bootstrap_pkgs
View File

@ -105,17 +105,17 @@ run_makepkg() {
rm_makepkg_dir() { rm_makepkg_dir() {
echo "Removing temporary makepkg build directory at $PKGBUILD_dir" echo "Removing temporary makepkg build directory at $PKGBUILD_dir"
rm -r "$PKGBUILD_dir" rm -r -f "$PKGBUILD_dir"
} }
rm_yaytmp() { rm_yaytmp() {
echo "Removing temporary build directory for yay at $YAYTMP" echo "Removing temporary build directory for yay at $YAYTMP"
rm -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 -r -f "$NOBODY_SUDO_CONF" rm -f "$NOBODY_SUDO_CONF"
} }
clean_up() { clean_up() {
@ -125,7 +125,7 @@ clean_up() {
exit exit
} }
trap 'clean_up' ERR EXIT trap 'clean_up' ERR
if [[ ! "$(id -u)" = "0" ]]; then if [[ ! "$(id -u)" = "0" ]]; then
echo "This script must be run as root. Exiting" echo "This script must be run as root. Exiting"
@ -137,7 +137,10 @@ try_nobody_update
mk_yaytmp mk_yaytmp
run_yay run_yay
rm_yaytmp
mk_makepkg_dir mk_makepkg_dir
run_makepkg run_makepkg
rm_makepkg_dir
rm_nobody_perms