diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-07-13 19:37:15 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-07-13 19:37:15 +0200 |
| commit | a8f512a665f294657279c6823ff23887dd41a8d5 (patch) | |
| tree | 5325e4296b9c2ff2e47d90876bd8e95694d40c72 | |
| parent | 086ff8b9e7cc5a5cb57d230039a28354fe3f62f8 (diff) | |
| download | devtools-a8f512a665f294657279c6823ff23887dd41a8d5.tar.gz devtools-a8f512a665f294657279c6823ff23887dd41a8d5.zip | |
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.
| -rw-r--r-- | makechrootpkg.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 246774a..23314c6 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -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" |