From 21188d5dfa9f73a78bdd5ee44833d5ba82734202 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Fri, 23 Jan 2015 16:28:44 +0100
Subject: [PATCH] labs: abort on config/scripts.* syntax errors

Instead of skipping only lines starting with a '#' (comments), also skip
empty lines. For all other lines that are not commands, abort with a
syntax error.

Change-Id: I5e326f2eb27e4aa72ff75a211e36bc3b3a78126f
---
 labs/lib/osbash/functions.host | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/labs/lib/osbash/functions.host b/labs/lib/osbash/functions.host
index f9b7dc5d..9a54123e 100644
--- a/labs/lib/osbash/functions.host
+++ b/labs/lib/osbash/functions.host
@@ -381,11 +381,20 @@ function autostart_from_config {
     # are free to mess with the standard file descriptors.
     exec 3< "$config_path"
     while read -r field_1 field_2 <&3; do
-        if [[ $field_1 =~ ^# ]]; then
-            # Skip lines that are commented out
+        if [[ $field_1 =~ (^$|^#) ]]; then
+            # Skip empty lines and lines that are commented out
             continue
         elif [ "$field_1" == "cmd" ]; then
             command_from_config $field_2
+        else
+            # Syntax error
+            echo -n >&2 "ERROR in $config_file: '$field_1"
+            if [ -n "$field_2" ]; then
+                echo >&2 " $field_2'"
+            else
+                echo >&2 "'"
+            fi
+            exit 1
         fi
     done
 }