moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: redirect various error msg to stderr

Browse source 
We couldn't use msg_red or msg_error,
since they won't be available until line #680
This commit is contained in:
Doan Tran Cong Danh 2019-07-10 15:31:21 +07:00 • committed by Enno Boland
parent 7cd9fbbde2
commit 06cbdef6eb
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xbps-src
View file

@ -212,7 +212,7 @@ check_reqhost_utils() {
for f in ${REQHOST_UTILS}; do for f in ${REQHOST_UTILS}; do
if ! command -v ${f} &>/dev/null; then if ! command -v ${f} &>/dev/null; then
echo "${f} is missing in your system, can't continue!" echo "${f} is missing in your system, can't continue!" 1>&2
broken=1 broken=1
fi fi
done done
@ -221,7 +221,7 @@ check_reqhost_utils() {
for f in ${REQHOST_UTILS_BOOTSTRAP}; do for f in ${REQHOST_UTILS_BOOTSTRAP}; do
if ! command -v ${f} &>/dev/null; then if ! command -v ${f} &>/dev/null; then
echo "${f} is missing in your system, can't continue!" echo "${f} is missing in your system, can't continue!" 1>&2
broken=1 broken=1
fi fi
done done
@ -238,8 +238,8 @@ check_build_requirements() {
if [ -z "$found" ]; then if [ -z "$found" ]; then
xbps-uhelper cmpver "$XBPS_VERSION" "$XBPS_VERSION_REQ" xbps-uhelper cmpver "$XBPS_VERSION" "$XBPS_VERSION_REQ"
if [ $? -eq 255 ]; then if [ $? -eq 255 ]; then
echo "ERROR: requires xbps>=${XBPS_VERSION_REQ}" echo "ERROR: requires xbps>=${XBPS_VERSION_REQ}" 1>&2
echo "Bootstrap packages must be updated with 'xbps-src bootstrap-update'" echo "Bootstrap packages must be updated with 'xbps-src bootstrap-update'" 1>&2
exit 1 exit 1
fi fi
fi fi
@ -501,7 +501,7 @@ fi
[ ! -d $XBPS_HOSTDIR ] && mkdir -p $XBPS_HOSTDIR [ ! -d $XBPS_HOSTDIR ] && mkdir -p $XBPS_HOSTDIR
if [ -d "$XBPS_MASTERDIR" -a ! -w "$XBPS_MASTERDIR" ]; then if [ -d "$XBPS_MASTERDIR" -a ! -w "$XBPS_MASTERDIR" ]; then
echo "ERROR: can't write to masterdir $XBPS_MASTERDIR." echo "ERROR: can't write to masterdir $XBPS_MASTERDIR." 1>&2
exit 1 exit 1
fi fi
@ -511,7 +511,7 @@ if command -v chroot-git &>/dev/null; then
elif command -v git &>/dev/null; then elif command -v git &>/dev/null; then
XBPS_GIT_CMD=$(command -v git) XBPS_GIT_CMD=$(command -v git)
else else
echo "neither chroot-git or git are available in your system!" echo "neither chroot-git or git are available in your system!" 1>&2
exit 1 exit 1
fi fi
readonly XBPS_GIT_CMD readonly XBPS_GIT_CMD