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

use command(1) to get executable's path

Browse source
This commit is contained in:
Philippe Grégoire 2017-08-21 10:51:48 -04:00
commit 31e5c97c55
No known key found for this signature in database
GPG key ID: A14AA6DA679C2177
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/conf/type/__user/explorer/group
View file

@ -23,8 +23,9 @@
if [ -f "$__object/parameter/gid" ]; then if [ -f "$__object/parameter/gid" ]; then
gid=$(cat "$__object/parameter/gid") gid=$(cat "$__object/parameter/gid")
if [ -x /usr/bin/getent ] || [ -x /bin/getent ]; then getent=$(command -v getent)
getent group "$gid" || true if [ X != X"${getent}" ]; then
"${getent}" group "$gid" || true
elif [ -f /etc/group ]; then elif [ -f /etc/group ]; then
grep -E "^(${gid}|([^:]+:){2}${gid}):" /etc/group || true grep -E "^(${gid}|([^:]+:){2}${gid}):" /etc/group || true
fi fi

5
cdist/conf/type/__user/explorer/passwd
View file

@ -23,8 +23,9 @@
name=$__object_id name=$__object_id
if [ -x /usr/bin/getent ] || [ -x /bin/getent ]; then getent=$(command -v getent)
getent passwd "$name" || true if [ X != X"${getent}" ]; then
"${getent}" passwd "$name" || true
elif [ -f /etc/passwd ]; then elif [ -f /etc/passwd ]; then
grep "^${name}:" /etc/passwd || true grep "^${name}:" /etc/passwd || true
fi fi

5
cdist/conf/type/__user/explorer/shadow
View file

@ -31,8 +31,9 @@ case "$os" in
esac esac
if [ -x /usr/bin/getent ] || [ -x /bin/getent ]; then getent=$(command -v getent)
getent "$database" "$name" || true if [ X != X"${getent}" ]; then
"${getent}" "$database" "$name" || true
elif [ -f /etc/shadow ]; then elif [ -f /etc/shadow ]; then
grep "^${name}:" /etc/shadow || true grep "^${name}:" /etc/shadow || true
fi fi