common/travis/check-install.sh: don't exit after install failure
This allows for showing all install errors for a package at once, rather than having to check one at a time.
This commit is contained in:
parent
01c9aae09c
commit
d029dcf6f1
1 changed files with 10 additions and 4 deletions
|
@ -30,19 +30,25 @@ ROOTDIR="-r /check-install"
|
||||||
# if this fails, there were no packages built for this arch and thus no repodatas
|
# if this fails, there were no packages built for this arch and thus no repodatas
|
||||||
xbps-install $ROOTDIR $ADDREPO $CONFDIR -S || exit 0
|
xbps-install $ROOTDIR $ADDREPO $CONFDIR -S || exit 0
|
||||||
|
|
||||||
|
failed=()
|
||||||
while read -r pkg; do
|
while read -r pkg; do
|
||||||
for subpkg in $(xsubpkg $pkg); do
|
for subpkg in $(xsubpkg $pkg); do
|
||||||
/bin/echo -e "\x1b[32mTrying to install dependents of $subpkg:\x1b[0m"
|
/bin/echo -e "\x1b[32mTrying to install dependents of $subpkg:\x1b[0m"
|
||||||
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
|
for dep in $(xbps-query $ADDREPO -RX "$subpkg"); do
|
||||||
|
ret=0
|
||||||
xbps-install \
|
xbps-install \
|
||||||
$ROOTDIR $ADDREPO $CONFDIR \
|
$ROOTDIR $ADDREPO $CONFDIR \
|
||||||
-ny \
|
-ny \
|
||||||
"$subpkg" "$(xbps-uhelper getpkgname "$dep")"
|
"$subpkg" "$(xbps-uhelper getpkgname "$dep")" \
|
||||||
ret="$?"
|
|| ret="$?"
|
||||||
if [ "$ret" -eq 8 ] || [ "$ret" -eq 11 ]; then
|
if [ "$ret" -ne 0 ]; then
|
||||||
/bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m"
|
/bin/echo -e "\x1b[31mFailed to install '$subpkg' and '$dep'\x1b[0m"
|
||||||
exit 1
|
failed+=("Failed to install '$subpkg' and '$dep'")
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
done < /tmp/templates
|
done < /tmp/templates
|
||||||
|
for msg in "${failed[@]}"; do
|
||||||
|
/bin/echo -e "\x1b[31m$msg\x1b[0m"
|
||||||
|
done
|
||||||
|
exit ${#failed[@]}
|
||||||
|
|
Loading…
Add table
Reference in a new issue