readline: do not use && || conditionals in do_funcs; breaks trap ERR.

This commit is contained in:
Juan RP 2013-03-25 21:25:47 +01:00
parent 1bcabefb3a
commit 4b38f2004a

View file

@ -23,16 +23,18 @@ pre_configure() {
if [ "${_patch_ver}" -gt 000 ]; then if [ "${_patch_ver}" -gt 000 ]; then
for p in $(seq -w 001 ${_patch_ver}); do for p in $(seq -w 001 ${_patch_ver}); do
cd ${XBPS_SRCDISTDIR} || return 1 cd ${XBPS_SRCDISTDIR}
[ -f ${XBPS_SRCDISTDIR}/readline62-${p} ] && continue if [ -f ${XBPS_SRCDISTDIR}/readline62-${p} ]; then
continue
fi
msg_normal " Fetching $url/readline62-$p ...\n" msg_normal " Fetching $url/readline62-$p ...\n"
$XBPS_FETCH_CMD ${url}/readline62-$p $XBPS_FETCH_CMD ${url}/readline62-$p
done done
fi fi
cd ${wrksrc} cd ${wrksrc}
for p in $(seq -w 001 ${_patch_ver}); do for p in $(seq -w 001 ${_patch_ver}); do
patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline62-${p} && \ patch -s -Np0 -i ${XBPS_SRCDISTDIR}/readline62-${p}
msg_normal " Applying patch readline62-$p.\n" msg_normal " Applying patch readline62-$p.\n"
done done
sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
} }