use getent for passwd and group if available

3 files changed, 15 insertions, 3 deletions

diff --git a/share/functions/__fish_complete_groups.fish b/share/functions/__fish_complete_groups.fish
index b3da864b..3eb78292 100644
--- a/share/functions/__fish_complete_groups.fish
+++ b/share/functions/__fish_complete_groups.fish
@@ -1,4 +1,8 @@
 
 function __fish_complete_groups --description "Print a list of local groups, with group members as the description"
-	cat /etc/group | sed -e "s/^\([^:]*\):[^:]*:[^:]*:\(.*\)/\1\tMembers: \2/"
+	if test -x /usr/bin/getent
+		getent group | cut -d ':' -f 1,4 | sed 's/:/\t/'
+	else
+		cut -d ':' -f 1,4 /etc/group | sed 's/:/\t/'
+	end
 end
diff --git a/share/functions/__fish_complete_users.fish b/share/functions/__fish_complete_users.fish
index e3ca35f4..82fa8577 100644
--- a/share/functions/__fish_complete_users.fish
+++ b/share/functions/__fish_complete_users.fish
@@ -1,4 +1,8 @@
 
 function __fish_complete_users --description "Print a list of local users, with the real user name as a description"
-	cat /etc/passwd | grep -ve '^#' | sed -e 's/^\([^:]*\):[^:]*:[^:]*:[^:]*:\([^:]*\):.*$/\1'\t'\2/' ^/dev/null
+	if test -x /usr/bin/getent
+		getent passwd | cut -d : -f 1,5 | sed 's/:/\t/'
+	else
+		sgrep -ve '^#' /etc/passwd | cut -d : -f 1,5 | sed 's/:/\t/'
+	end
 end
diff --git a/share/functions/__fish_print_users.fish b/share/functions/__fish_print_users.fish
index fa8e0d17..0a67ab55 100644
--- a/share/functions/__fish_print_users.fish
+++ b/share/functions/__fish_print_users.fish
@@ -1,5 +1,9 @@
 
 function __fish_print_users --description "Print a list of local users"
-	cat /etc/passwd | cut -d : -f 1
+	if test -x /usr/bin/getent
+		getent passwd | cut -d : -f 1
+	else
+		sgrep -ve '^#' /etc/passwd | cut -d : -f 1
+	end
 end