New f_show_info() function for dialog(1) --infobox using printf(1) syntax.
This commit is contained in:
parent
fa2e39c892
commit
13aadd84f5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=244555
@ -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
|
||||
@ -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
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user