Use msg_normal() in more places.
--HG-- extra : convert_revision : 84a2e9c6bd3baf5e7f76668af061442892dfb04b
This commit is contained in:
parent
dc0383b059
commit
3f1c7c69cf
6
xbps.sh
6
xbps.sh
|
@ -1086,7 +1086,7 @@ install_dependencies_pkg()
|
||||||
|
|
||||||
[ -z "$deps_list" -a -z "$installed_deps_list" ] && return 0
|
[ -z "$deps_list" -a -z "$installed_deps_list" ] && return 0
|
||||||
|
|
||||||
echo "==> Required dependencies for $(basename $pkg):"
|
msg_normal "Required dependencies for $(basename $pkg):"
|
||||||
for i in ${installed_deps_list}; do
|
for i in ${installed_deps_list}; do
|
||||||
fpkg="$($XBPS_PKGDB_CMD list|$grep_cmd -w ${i%-[0-9]*.*})"
|
fpkg="$($XBPS_PKGDB_CMD list|$grep_cmd -w ${i%-[0-9]*.*})"
|
||||||
echo " $i: found $fpkg."
|
echo " $i: found $fpkg."
|
||||||
|
@ -1101,7 +1101,7 @@ install_dependencies_pkg()
|
||||||
check_installed_pkg $i ${i##[aA-zZ]*-}
|
check_installed_pkg $i ${i##[aA-zZ]*-}
|
||||||
[ $? -eq 0 ] && continue
|
[ $? -eq 0 ] && continue
|
||||||
# continue installing deps
|
# continue installing deps
|
||||||
echo "==> Installing $pkg dependency: $i."
|
msg_normal "Installing $pkg dependency: $i."
|
||||||
install_pkg ${i%-[0-9]*.*}
|
install_pkg ${i%-[0-9]*.*}
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -1123,7 +1123,7 @@ install_builddeps_required_pkg()
|
||||||
for dep in ${build_depends}; do
|
for dep in ${build_depends}; do
|
||||||
check_installed_pkg $dep ${dep##[aA-zZ]*-}
|
check_installed_pkg $dep ${dep##[aA-zZ]*-}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "==> Installing $pkg dependency: $dep."
|
msg_normal "Installing $pkg dependency: $dep."
|
||||||
install_pkg ${dep%-[0-9]*.*}
|
install_pkg ${dep%-[0-9]*.*}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue