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

Merge branch 'fix/type/__key_value/solaris-awk' into 'master'

Browse source 
__key_value: Get AWK from POSIX PATH

See merge request ungleich-public/cdist!913
This commit is contained in:
poljakowski 2020-07-27 06:01:53 +02:00
commit 1b18b9487e
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__key_value/explorer/state
View file

@ -40,7 +40,9 @@ else
fi fi
export key state delimiter value exact_delimiter export key state delimiter value exact_delimiter
awk -f - "$file" <<"AWK_EOF" awk_bin=$(PATH=$(getconf PATH 2>/dev/null) && command -v awk || echo awk)
"${awk_bin}" -f - "$file" <<"AWK_EOF"
BEGIN { BEGIN {
state=ENVIRON["state"] state=ENVIRON["state"]
key=ENVIRON["key"] key=ENVIRON["key"]

5
cdist/conf/type/__key_value/files/remote_script.sh
View file

@ -24,7 +24,10 @@ if [ -f "$file" ]; then
else else
touch "$file" touch "$file"
fi fi
awk -f - "$file" >"$tmpfile" <<"AWK_EOF"
awk_bin=$(PATH=$(getconf PATH 2>/dev/null) && command -v awk || echo awk)
"${awk_bin}" -f - "$file" >"$tmpfile" <<"AWK_EOF"
BEGIN { BEGIN {
# import variables in a secure way .. # import variables in a secure way ..
state=ENVIRON["state"] state=ENVIRON["state"]

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

@ -25,7 +25,7 @@ state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/state")" state_is="$(cat "$__object/explorer/state")"
fire_onchange='' fire_onchange=''
if [ "$state_is" = "$state_should" ]; then if [ "$state_is" = "$state_should" ]; then
exit 0 exit 0
fi fi