From f38243474f89b37b1732616ba88d2fd2b1e1e694 Mon Sep 17 00:00:00 2001 From: riking Date: Fri, 6 Jun 2014 13:33:21 -0700 Subject: [PATCH] Print message on YML syntax error --- launcher | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/launcher b/launcher index cd9ccbd..841e3a4 100755 --- a/launcher +++ b/launcher @@ -185,6 +185,9 @@ set_template_info() { yml.strip! begin env.merge!(YAML.load(yml)['env'] || {}) + rescue Psych::SyntaxError => e + puts e + puts "*ERROR." rescue => e puts yml p e @@ -196,12 +199,20 @@ RUBY raw=`exec echo "$input" | $docker_path run --rm -i -a stdin -a stdout $image ruby -e "$env_ruby"` env=() + ok=1 while read i; do - if [ -n "$i" ]; then + if [ "$i" == "*ERROR." ]; then + ok=0 + elif [ -n "$i" ]; then env[${#env[@]}]=$i fi done <<< "$raw" + if [ "$ok" -ne 1 ]; then + echo "${env[@]}" + echo "YAML syntax error. Please check your configuration files." + exit 1 + fi echo "Calculated ENV: ${env[@]}" } -- 2.25.1