moep/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added option comment_line to prefix key value with a comment line

Browse source
This commit is contained in:
Daniel Heule 2014-02-24 23:27:42 +01:00
commit 820ed5ae0c
3 changed files with 43 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

52
cdist/conf/type/__key_value/gencode-remote
View file

@ -47,22 +47,26 @@ case "$state_should" in
exit 1 exit 1
esac esac
cat <<CDIST_HEREDOC_END_HERE_MARKER cat <<__CDIST_HEREDOC_END_HERE_MARKER
export state="\$(cat <<"CDIST_INPUT_END_HERE_MARKER" export state="\$(cat <<"__CDIST_INPUT_END_HERE_MARKER"
$state_should $state_should
CDIST_INPUT_END_HERE_MARKER __CDIST_INPUT_END_HERE_MARKER
)" )"
export key="\$(cat <<"CDIST_INPUT_END_HERE_MARKER" export key="\$(cat <<"__CDIST_INPUT_END_HERE_MARKER"
$key $key
CDIST_INPUT_END_HERE_MARKER __CDIST_INPUT_END_HERE_MARKER
)" )"
export delimiter="\$(cat <<"CDIST_INPUT_END_HERE_MARKER" export delimiter="\$(cat <<"__CDIST_INPUT_END_HERE_MARKER"
$(cat "$__object/parameter/delimiter") $(cat "$__object/parameter/delimiter")
CDIST_INPUT_END_HERE_MARKER __CDIST_INPUT_END_HERE_MARKER
)" )"
export value="\$(cat <<"CDIST_INPUT_END_HERE_MARKER" export value="\$(cat <<"__CDIST_INPUT_END_HERE_MARKER"
$(cat "$__object/parameter/value") $(cat "$__object/parameter/value")
CDIST_INPUT_END_HERE_MARKER __CDIST_INPUT_END_HERE_MARKER
)"
export comment="\$(cat <<"__CDIST_INPUT_END_HERE_MARKER"
$(cat "$__object/parameter/comment_line")
__CDIST_INPUT_END_HERE_MARKER
)" )"
tmpfile=\$(mktemp "${file}.cdist.XXXXXXXXXX") tmpfile=\$(mktemp "${file}.cdist.XXXXXXXXXX")
@ -75,9 +79,12 @@ BEGIN {
key=ENVIRON["key"] key=ENVIRON["key"]
delimiter=ENVIRON["delimiter"] delimiter=ENVIRON["delimiter"]
value=ENVIRON["value"] value=ENVIRON["value"]
comment=ENVIRON["comment"]
keydel=key delimiter keydel=key delimiter
line=keydel value line=keydel value
inserted=0 inserted=0
ll=""
llpopulated=0
} }
# enter the main loop # enter the main loop
{ {
@ -85,25 +92,48 @@ BEGIN {
i = index(\$0,keydel) i = index(\$0,keydel)
if(i == 1) { if(i == 1) {
if(state == "absent") { if(state == "absent") {
if(ll == comment) {
# if comment is present, clear llpopulated flag
llpopulated=0
}
# if absent, simple yump over this line # if absent, simple yump over this line
next next
} }
else { else {
# if comment is present and not present in last line
if (llpopulated == 1) {
print ll
if( comment != "" && ll != comment) {
print comment
}
llpopulated=0
}
inserted=1 inserted=1
# state is present, so insert correct line here # state is present, so insert correct line here
print line print line
ll=line
next next
} }
} }
else { else {
print \$0 if(llpopulated == 1) {
print ll
}
ll=\$0
llpopulated=1
} }
} }
END { END {
if(llpopulated == 1) {
print ll
}
if(inserted == 0 && state == "present" ) { if(inserted == 0 && state == "present" ) {
if(comment != "" && ll != comment){
print comment
}
print line print line
} }
} }
AWK_EOF AWK_EOF
mv -f "\$tmpfile" "$file" mv -f "\$tmpfile" "$file"
CDIST_HEREDOC_END_HERE_MARKER __CDIST_HEREDOC_END_HERE_MARKER

1
cdist/conf/type/__key_value/parameter/default/comment_line Normal file
View file

@ -0,0 +1 @@

1
cdist/conf/type/__key_value/parameter/optional
View file

@ -1,3 +1,4 @@
key key
value value
state state
comment_line