Skip to content
Snippets Groups Projects
Commit 1df67997 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig) Committed by Lukas Fleischer
Browse files

makechrootpkg: Always set PKGDEST and SRCDEST

parent e41deee5
No related branches found
No related tags found
No related merge requests found
...@@ -188,6 +188,10 @@ fi ...@@ -188,6 +188,10 @@ fi
[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf) [[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf) [[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
# Use PKGBUILD directory if PKGDEST or SRCDEST don't exist
[[ -d $PKGDEST ]] || PKGDEST=.
[[ -d $SRCDEST ]] || SRCDEST=.
mkdir -p "$copydir/pkgdest" mkdir -p "$copydir/pkgdest"
if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then
echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf" echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
...@@ -270,11 +274,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then ...@@ -270,11 +274,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
popd >/dev/null popd >/dev/null
fi fi
if [[ -d $PKGDEST ]]; then mv "$pkgfile" "$PKGDEST"
mv "$pkgfile" "$PKGDEST"
else
mv "$pkgfile" .
fi
done done
for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
...@@ -287,11 +287,7 @@ fi ...@@ -287,11 +287,7 @@ fi
for f in "$copydir"/srcdest/*; do for f in "$copydir"/srcdest/*; do
[[ -e $f ]] || continue [[ -e $f ]] || continue
if [[ -d $SRCDEST ]]; then mv "$f" "$SRCDEST"
mv "$f" "$SRCDEST"
else
mv "$f" .
fi
done done
if [[ -e $copydir/build/BUILD_FAILED ]]; then if [[ -e $copydir/build/BUILD_FAILED ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment