xbps-src: improve check for existing "masterdir"

This commit is contained in:
classabbyamp 2024-01-27 16:16:39 -08:00
parent bbdc3e76ab
commit 7940dc3fb4
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
1 changed files with 2 additions and 2 deletions

View File

@ -535,8 +535,8 @@ if [ "$XBPS_CHROOT_CMD" = ethereal ]; then
else else
: "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}" : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}"
# but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't
if [ ! -d "${XBPS_MASTERDIR}" ] && [ -d "${XBPS_DISTDIR}/masterdir" ] \ if [ ! -d "${XBPS_MASTERDIR}" ] && [ -r "${XBPS_DISTDIR}/masterdir/.xbps_chroot_init" ] \
&& [ "$(cat "${XBPS_DISTDIR}"/masterdir/.xbps_chroot_init)" = "$XBPS_MACHINE" ]; then && [ "$(cat "${XBPS_DISTDIR}/masterdir/.xbps_chroot_init")" = "$XBPS_MACHINE" ]; then
XBPS_MASTERDIR="${XBPS_DISTDIR}/masterdir" XBPS_MASTERDIR="${XBPS_DISTDIR}/masterdir"
fi fi
fi fi