makechrootpkg: Move makepkg-as-root check to main()
download_sources(), while the first invocation of makepkg, is a rather odd place for this kind of guard.
This commit is contained in:
parent
086ff8b9e7
commit
a8f512a665
|
@ -271,14 +271,9 @@ download_sources() {
|
|||
chmod 1777 "$builddir"
|
||||
|
||||
# Ensure sources are downloaded
|
||||
if [[ "$(id -u "$makepkg_user")" != 0 ]]; then
|
||||
sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
||||
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
|
||||
die "Could not download sources."
|
||||
else
|
||||
error "Running makepkg as root is not allowed."
|
||||
exit 1
|
||||
fi
|
||||
sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
||||
makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
|
||||
die "Could not download sources."
|
||||
|
||||
# Clean up garbage from verifysource
|
||||
rm -rf "$builddir"
|
||||
|
@ -406,6 +401,11 @@ main() {
|
|||
[[ -f PKGBUILD ]] || return $ret
|
||||
fi
|
||||
|
||||
if [[ "$(id -u "$makepkg_user")" == 0 ]]; then
|
||||
error "Running makepkg as root is not allowed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
download_sources "$copydir" "$makepkg_user"
|
||||
|
||||
prepare_chroot "$copydir" "$USER_HOME" "$repack"
|
||||
|
|
Loading…
Reference in New Issue