From ec38666e628d7ead4dd70e3023d96ba6a3b8e743 Mon Sep 17 00:00:00 2001 From: tuxce Date: Mon, 2 Jun 2014 15:20:34 +0200 Subject: [PATCH] Warn about root before any task Fixes #13 --- src/lib/pkgbuild.sh.in | 4 ---- src/yaourt.sh.in | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/pkgbuild.sh.in b/src/lib/pkgbuild.sh.in index 02c8c00..121a259 100644 --- a/src/lib/pkgbuild.sh.in +++ b/src/lib/pkgbuild.sh.in @@ -237,10 +237,6 @@ build_package() { fi # Build - if (( ! UID )); then - warning $(gettext 'Building package as root is dangerous.\n Please run yaourt as a non-privileged user.') - sleep 2 - fi SRCDEST="$YSRCDEST" PKGDEST="$YPKGDEST" makepkg "${MAKEPKG_ARG[@]}" -s -f -p ./PKGBUILD if (( $? )); then diff --git a/src/yaourt.sh.in b/src/yaourt.sh.in index 8b2a8cb..4fb3434 100755 --- a/src/yaourt.sh.in +++ b/src/yaourt.sh.in @@ -266,7 +266,11 @@ unset MAJOR AUR SEARCH BUILD REFRESH SYSUPGRADE CLEAN \ } &> /dev/null # makepkg check root -(( ! UID )) && program_arg $A_M "--asroot" +if (( ! UID )); then + warning $(gettext 'Building package as root is dangerous.\n Please run yaourt as a non-privileged user.') + sleep 2 + program_arg $A_M "--asroot" +fi # Explode arguments (-Su -> -S -u) ARGSANS=("$@")