Skip to content

Commit

Permalink
Fix #77041: buildconf should output error messages to stderr
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizunashi Mana authored and petk committed Oct 20, 2018
1 parent 4be0528 commit 9f5cb62
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions build/buildcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ fi
# autoconf 2.59 or newer
ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
if test -z "$ac_version"; then
echo "buildconf: autoconf not found."
echo " You need autoconf version 2.59 or newer installed"
echo " to build PHP from Git."
echo "buildconf: autoconf not found." >&2
echo " You need autoconf version 2.59 or newer installed" >&2
echo " to build PHP from Git." >&2
exit 1
fi
IFS=.; set $ac_version; IFS=' '
if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
echo "buildconf: autoconf version $ac_version found."
echo " You need autoconf version 2.59 or newer installed"
echo " to build PHP from Git."
echo "buildconf: autoconf version $ac_version found." >&2
echo " You need autoconf version 2.59 or newer installed" >&2
echo " to build PHP from Git." >&2
exit 1
else
echo "buildconf: autoconf version $ac_version (ok)"
Expand Down
2 changes: 1 addition & 1 deletion build/genif.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ awk=$1
shift

if test -z "$infile" || test -z "$srcdir"; then
echo "please supply infile and srcdir"
echo "please supply infile and srcdir" >&2
exit 1
fi

Expand Down
4 changes: 2 additions & 2 deletions buildconf
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ while test $# -gt 0; do
done

if test "$dev" = "0" -a "$devok" = "0"; then
echo "You should not run buildconf in a release package."
echo "use buildconf --force to override this check."
echo "You should not run buildconf in a release package." >&2
echo "use buildconf --force to override this check." >&2
exit 1
fi

Expand Down
4 changes: 2 additions & 2 deletions makedist
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ DIR=php-$VER
DIRPATH=$MY_OLDPWD/$DIR

if test -d "$DIRPATH"; then
echo "The directory $DIR"
echo "already exists, rename or remove it and run makedist again."
echo "The directory $DIR" >&2
echo "already exists, rename or remove it and run makedist again." >&2
exit 1
fi

Expand Down

0 comments on commit 9f5cb62

Please sign in to comment.