From 33929c79234f299c2c45f4278f4f6194993341f1 Mon Sep 17 00:00:00 2001
From: dteske <dteske@FreeBSD.org>
Date: Tue, 1 Apr 2014 00:19:13 +0000
Subject: MFC revisions
 260894,260899,262895-262902,262904,262908-262910,262982,
 262984,263133-263137,263139,263141,263144-263150, and (partially) 263249 (31
 revisions; summarized below)... r260894: Optimize f_expand_number(),
 improving performance r260899: s/__number/__num/ in f_expand_number()
 r262895: Allow dispatched reswords to carry arguments r262896: Add missing
 local declaration r262897: Fix a typo in a comment r262898: Fix incorrect
 return status if var_to_set and var_to_get are same r262899: Make f_show_err
 non-fatal r262900: Centralize function name; Update a comment while here
 r262901: s/__num/__number/ in f_expand_number() r262902: Comment to go with
 NL global introduced by previous commit r262904: Rewrite groupmgmt -- hooking
 it into the scripting system r262908: Change dispatch words from group* to
 *Group for backward compat r262909: Fix copy/paste error in a comment
 r262910: Take a group name on the command-line if available r262982:
 Whitespace r262984: Remove vestigial global, no longer used since r262904
 r263133: Remove indexfile from debug statement (already logged) r263134: Add
 debug statement just before attempting to exec a module r263135: Comments
 r263136: Update copyright r263137: Fix future namespace issues for functions
 taking $var_to_set r263139: Remove useless NULL string in compound strings
 r263141: Pointy hat! Fix a broken f_isinteger() r263144: Fix a code-typo that
 prevented auto-sizing of a dialog r263145: Fix comments and whitespace
 r263146: Reduce the sleep cycle when using dialog(1) [infobox] to 1-second
 r263147: Fix a bug preventing errors from pw(8) from appearing r263148: For
 non-interactive scripts, forgot to check argument r263149: Add protection
 against input containing single-quotes r263150: Rewrite usermgmt r263249:
 (partial) Add more obsolete files

---
 usr.sbin/bsdconfig/usermgmt/groupedit | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'usr.sbin/bsdconfig/usermgmt/groupedit')

diff --git a/usr.sbin/bsdconfig/usermgmt/groupedit b/usr.sbin/bsdconfig/usermgmt/groupedit
index 953f4f5..2338d57 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupedit
+++ b/usr.sbin/bsdconfig/usermgmt/groupedit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2012 Ron McDowell
-# Copyright (c) 2012-2013 Devin Teske
+# Copyright (c) 2012-2014 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,6 +34,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/usermgmt/group.subr
 f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
@@ -65,9 +66,17 @@ f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
 f_mustberoot_init
 
 #
-# Loop until the user Exits, Cancels or presses ESC
+# If given a group name, operate on it and exit
 #
-defaultitem=""
+if [ "$1" ]; then
+	f_group_edit "$1"
+	exit $SUCCESS
+fi
+
+#
+# Present a list of groups and loop until user Exits, Cancels or presses ESC
+#
+defaultitem=
 while :; do
 	f_dialog_menu_group_list "$defaultitem"
 	retval=$?
@@ -81,8 +90,7 @@ while :; do
 
 	# Anything else is a group name
 
-	$BSDCFG_LIBE/$APP_DIR/groupinput \
-		${USE_XDIALOG:+-X} mode="Edit/View" group="$mtag"
+	f_group_edit "$mtag"
 done
 
 exit $SUCCESS
-- 
cgit v1.1