Merged.
--- a/mkready Thu Jul 15 15:26:38 2010 +0200
+++ b/mkready Thu Jul 15 15:33:01 2010 +0200
@@ -24,20 +24,18 @@
# nicht signiert wird die standard-zonedatei eingetragen.
if [ -f $master_dir/$domain/$domain.signed ]
then
- if ! grep -q "file" $conf_file | grep "signed"
+ if ! grep -q "file.*signed\"" $conf_file
then
- cp $conf_file .tmp
- sed -e "s\\$zone\\$zone_signed\\g" < .tmp > $conf_file
+ sed -e "s\\$zone\\$zone_signed\\g" <$conf_file >$tmpfile
+ mv $tmpfile $conf_file
echo $zone '-->' $zone_signed
- rm .tmp
fi
else
- if ( grep "file" $conf_file | grep "signed" ) > /dev/null
+ if grep -q "file.*signed\"" $conf_file
then
- cp $conf_file .tmp
- sed -e "s\\$zone_signed\\$zone\\g" < .tmp > $conf_file
+ sed -e "s\\$zone_signed\\$zone\\g" <$conf_file >$tmpfile
+ mv $tmpfile $conf_file
echo $zone_signed '-->' $zone
- rm .tmp
fi
fi
done