Date: Fri, 21 Dec 2012 20:29:29 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244555 - in head/usr.sbin/bsdconfig: networking/share share Message-ID: <201212212029.qBLKTT8P032650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Fri Dec 21 20:29:28 2012 New Revision: 244555 URL: http://svnweb.freebsd.org/changeset/base/244555 Log: New f_show_info() function for dialog(1) --infobox using printf(1) syntax. Modified: head/usr.sbin/bsdconfig/networking/share/device.subr head/usr.sbin/bsdconfig/share/common.subr Modified: head/usr.sbin/bsdconfig/networking/share/device.subr ============================================================================== --- head/usr.sbin/bsdconfig/networking/share/device.subr Fri Dec 21 20:11:41 2012 (r244554) +++ head/usr.sbin/bsdconfig/networking/share/device.subr Fri Dec 21 20:29:28 2012 (r244555) @@ -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 Modified: head/usr.sbin/bsdconfig/share/common.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/common.subr Fri Dec 21 20:11:41 2012 (r244554) +++ head/usr.sbin/bsdconfig/share/common.subr Fri Dec 21 20:29:28 2012 (r244555) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212212029.qBLKTT8P032650>