Merge lp:~thedac/charms/precise/errors/fix-seds into lp:~daisy-pluckers/charms/precise/errors/trunk

[David Ames]

Fix *_settings seds to be more robust. It was missing key='' entries

=== modified file 'hooks/common'
--- hooks/common	2014-03-10 23:53:55 +0000
+++ hooks/common	2014-03-17 16:12:29 +0000
@@ -32,7 +32,7 @@
     if ! grep -qs "$key" $LOCAL_CONFIG_PATH; then
         echo "$key = '$value'" >> $LOCAL_CONFIG_PATH
     else
-        sed -i "s,$key = .*,$key = '$value'," $LOCAL_CONFIG_PATH
+        sed -r -i "s,$key ?=.*,$key = '$value'," $LOCAL_CONFIG_PATH
     fi
 }
 
@@ -41,7 +41,7 @@
     if ! grep -qs "cassandra_hosts" $LOCAL_CONFIG_PATH; then
         echo "cassandra_hosts = ['$value']" >> $LOCAL_CONFIG_PATH
     else
-        sed -i "s/cassandra_hosts = .*/cassandra_hosts = [$value]/" \
+        sed -r -i "s/cassandra_hosts ?=.*/cassandra_hosts = [$value]/" \
             $LOCAL_CONFIG_PATH
     fi
 }