Skip to content

Commit

Permalink
New f_show_info() function for dialog(1) --infobox using printf(1) sy…
Browse files Browse the repository at this point in the history
…ntax.
  • Loading branch information
devinteske committed Dec 21, 2012
1 parent 9edf4bc commit ea3604c
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
6 changes: 2 additions & 4 deletions usr.sbin/bsdconfig/networking/share/device.subr
Expand Up @@ -436,8 +436,7 @@ f_dialog_menu_netdev_edit()
"$options" != "$options_orig" -o \
"$dhcp" != "$dhcp_orig" ]
then
f_dialog_info "$( printf "$msg_saving_network_interface" \
"$interface" )"
f_show_info "$msg_saving_network_interface" "$interface"

local value=
if [ "$dhcp" ]; then
Expand All @@ -458,8 +457,7 @@ f_dialog_menu_netdev_edit()
f_dialog_yesno "Would you like to bring the $interface" \
"interface up right now?"
if [ $? -eq $SUCCESS ]; then
f_dialog_info "$( printf "$msg_bring_interface_up" \
"$interface" )"
f_show_info "$msg_bring_interface_up" "$interface"

local dr="$( f_sysrc_get defaultrouter )" err
if [ "$dr" = "NO" -o ! "$dr" ]; then
Expand Down
21 changes: 21 additions & 0 deletions usr.sbin/bsdconfig/share/common.subr
Expand Up @@ -136,6 +136,27 @@ f_interrupt()
f_die
}

# f_show_info $fmt [ $opts ... ]
#
# Display a message in a dialog infobox using printf(1) syntax.
#
f_show_info()
{
local msg
msg=$( printf "$@" )

#
# Use f_dialog_infobox from dialog.subr if possible, otherwise fall
# back to dialog(1) (without options, making it obvious when using
# un-aided system dialog).
#
if f_have f_dialog_info; then
f_dialog_info "$msg"
else
dialog --infobox "$msg" 0 0
fi
}

# f_show_msg $fmt [ $opts ... ]
#
# Display a message in a dialog box using printf(1) syntax.
Expand Down

0 comments on commit ea3604c

Please sign in to comment.