From f5c3a1b62801be35755071189132ac69bbe844a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 28 Mar 2017 11:08:37 +0200 Subject: [PATCH] Avoid using echo -e MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not working on some /bin/sh versions and there is no reason to enforce bash just because of this. Signed-off-by: Michal Čihař --- test-docker.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-docker.sh b/test-docker.sh index dbc3bb52..1b875b76 100755 --- a/test-docker.sh +++ b/test-docker.sh @@ -20,9 +20,9 @@ PHPMYADMIN_PORT=${TESTSUITE_PORT:=80} PHPMYADMIN_URL=http://$PHPMYADMIN_HOSTNAME:$PORT/ # Color text output -GREEN='\033[0;32m' -RED='\033[0;31m' -NC='\033[0m' # No Color +GREEN="\033[0;32m" +RED="\033[0;31m" +NC="\033[0m" # No Color ret=0 # Check if script is running inside container @@ -42,7 +42,7 @@ if [ -f /.dockerenv ] ; then TIMEOUT=$((TIMEOUT + 1)) if [ $TIMEOUT -gt 3 ] ; then echo "Failed to connect ${PHPMYADMIN_DB_HOSTNAME} database!" - echo -e "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" + echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" ret=1 exit 1 fi @@ -73,7 +73,7 @@ while ! $COMMAND_HOST ps aux | grep -q nginx ; do TIMEOUT=$((TIMEOUT + 1)) if [ $TIMEOUT -gt 10 ] ; then echo "Failed to connect PHPMyAdmin!" - echo -e "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" + echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" ret=1 exit 1 fi @@ -92,8 +92,8 @@ if [ $ret -ne 0 ] ; then $COMMAND_HOST cat /var/log/php-fpm.log $COMMAND_HOST cat /var/log/nginx-error.log $COMMAND_HOST cat /var/log/supervisord.log - echo -e "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" + echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${RED}FAILED${NC}" exit $ret fi -echo -e "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${GREEN}SUCCESS${NC}" +echo "Result of ${PHPMYADMIN_DB_HOSTNAME} tests: ${GREEN}SUCCESS${NC}"