use command(1) to get executable's path

remotes/origin/4.6
Philippe Grégoire 7 years ago
parent 997fdd8ac4
commit 31e5c97c55
No known key found for this signature in database
GPG Key ID: A14AA6DA679C2177
  1. 5
      cdist/conf/type/__user/explorer/group
  2. 5
      cdist/conf/type/__user/explorer/passwd
  3. 5
      cdist/conf/type/__user/explorer/shadow

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

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

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

Loading…
Cancel
Save