kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

[type/__mail_alias] Fix error with some AWK implementations

Browse source 
Some AWK implementations seem to have a problem with parameters named default.

    awk: cmd. line:2: function sepafter(f, default,    _) {
    awk: cmd. line:2:                      ^ syntax error
    awk: cmd. line:5: 	return _ ? _ : default
    awk: cmd. line:5: 	               ^ syntax error

In addition the temp file is removed if an error occurs.
This commit is contained in:
Dennis Camera 2020-08-26 18:01:52 +02:00
parent 43c59985d0
commit 49d39eaee5
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
type/__mail_alias/gencode-remote
View file

@ -67,10 +67,10 @@ cat <<'EOF'
test -f "${aliases_file}" || touch "${aliases_file}" test -f "${aliases_file}" || touch "${aliases_file}"
awk -F ':[ \t]*' -v mode=$mode ' awk -F ':[ \t]*' -v mode=$mode '
function sepafter(f, default, _) { function sepafter(f, def, _) {
# finds the separator between field $f and $(f+1) # finds the separator between field $f and $(f+1)
_ = substr($0, length($f)+1, index(substr($0, length($f)+1), $(f+1))-1) _ = substr($0, length($f)+1, index(substr($0, length($f)+1), $(f+1))-1)
return _ ? _ : default return _ ? _ : def
} }
function write_aliases() { function write_aliases() {
@ -134,6 +134,7 @@ END {
write_aliases() write_aliases()
} }
' <"${aliases_file}" >"${aliases_file}.tmp" || { ' <"${aliases_file}" >"${aliases_file}.tmp" || {
rm -f "${aliases_file}.tmp"
echo 'Generating new aliases file failed!' >&2 echo 'Generating new aliases file failed!' >&2
exit 1 exit 1
} }