From d46af923ddf04b2fb0b754fb52d498d47583d8b6 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Sat, 14 Dec 2019 03:00:25 -0500 Subject: [PATCH] Detect sql warnings and abort quickstart If quickstart generates an SQL `WARNING` while running the import-sql script, abort. --- quickstart.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstart.sh b/quickstart.sh index 1a64a72a..52e79c79 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -251,7 +251,10 @@ echo " " echo "-------------------------------------------------------------------------------------" echo "====> : Start SQL postprocessing: ./build/tileset.sql -> PostgreSQL " echo " : Source code: https://github.com/openmaptiles/openmaptiles-tools/tree/master/docker/import-sql " -docker-compose run $DC_OPTS openmaptiles-tools import-sql +# If the output contains a WARNING, stop further processing +# Adapted from https://unix.stackexchange.com/questions/307562 +docker-compose run $DC_OPTS openmaptiles-tools import-sql | \ + awk -v s=": WARNING:" '$0~s{print; print "\n*** WARNING detected, aborting"; exit(1)} 1' echo " " echo "-------------------------------------------------------------------------------------"