forked from mirrored-repos/manjaro-tools
mkchrootpkg: fix namcap, should go upstream
This commit is contained in:
parent
f3bbc3b96f
commit
551cea0835
1 changed files with 3 additions and 7 deletions
|
@ -344,11 +344,7 @@ main() {
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ -n $SUDO_USER ]]; then
|
load_user_info
|
||||||
eval "USER_HOME=~$SUDO_USER"
|
|
||||||
else
|
|
||||||
USER_HOME=$HOME
|
|
||||||
fi
|
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
|
@ -380,9 +376,9 @@ main() {
|
||||||
|
|
||||||
download_sources "$copydir" "$src_owner"
|
download_sources "$copydir" "$src_owner"
|
||||||
|
|
||||||
prepare_chroot "$copydir" "$USER_HOME" "$repack"
|
prepare_chroot "$copydir" "$USER_HOME" "$repack" "$run_namcap"
|
||||||
|
|
||||||
bindmounts_rw=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
|
bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
|
||||||
|
|
||||||
if chroot-run -r "${bindmounts_ro[*]}" -w "${bindmounts_rw[*]}" "$copydir" \
|
if chroot-run -r "${bindmounts_ro[*]}" -w "${bindmounts_rw[*]}" "$copydir" \
|
||||||
/chrootbuild "${makepkg_args[@]}"; then
|
/chrootbuild "${makepkg_args[@]}"; then
|
||||||
|
|
Loading…
Reference in a new issue