Fix wrong error handling logic in php's build_interop.sh

If [[ "$DONE" != 1 ]] && echo "Failed to do composer install" && exit 1
is at the end of a shell script, even if DONE is 1, this will return with error
exit status. That's because [[ $DONE != 1 ]] has exitcode 1 and thus anything after && doesn't get executed
and the entire scripts exits the last exit code it seen (which is 1).
pull/22712/head
Jan Tattermusch 5 years ago
parent 7ec6ad434f
commit cfbeb3edd7
  1. 9
      tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
  2. 10
      tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh

@ -40,8 +40,11 @@ cd src/php
DONE=0
for ((i = 0; i < 5; i++)); do
php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install && DONE=1
[[ "$DONE" == 1 ]] && break
php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install && DONE=1 && break
done
[[ "$DONE" != 1 ]] && echo "Failed to do composer install" && exit 1
if [ "$DONE" != "1" ]
then
echo "Failed to do composer install"
exit 1
fi

@ -40,7 +40,11 @@ cd src/php
DONE=0
for ((i = 0; i < 5; i++)); do
php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install && DONE=1
[[ "$DONE" == 1 ]] && break
php -d extension=ext/grpc/modules/grpc.so /usr/local/bin/composer install && DONE=1 && break
done
[[ "$DONE" != 1 ]] && echo "Failed to do composer install" && exit 1
if [ "$DONE" != "1" ]
then
echo "Failed to do composer install"
exit 1
fi

Loading…
Cancel
Save