Deleted Added
sdiff udiff text old ( 250633 ) new ( 251190 )
full compact
rcvar (250633) rcvar (251190)
1#!/bin/sh
2#-
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
1#!/bin/sh
2#-
3# Copyright (c) 2012-2013 Devin Teske
4# All Rights Reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

--- 10 unchanged lines hidden (view full) ---

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/usr.sbin/bsdconfig/startup/rcvar 250633 2013-05-14 03:21:13Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/startup/rcvar 251190 2013-05-31 19:07:17Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." "$0"
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr

--- 24 unchanged lines hidden (view full) ---

60############################################################ FUNCTIONS
61
62# dialog_menu_main
63#
64# Display the dialog(1)-based application main menu.
65#
66dialog_menu_main()
67{
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." "$0"
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr

--- 24 unchanged lines hidden (view full) ---

60############################################################ FUNCTIONS
61
62# dialog_menu_main
63#
64# Display the dialog(1)-based application main menu.
65#
66dialog_menu_main()
67{
68 local size
69 local hline="$hline_arrows_tab_enter"
70 local prompt=""
71
72 RCVAR_MENU_LIST="
73 'X $msg_exit' '$msg_exit_this_menu'
74 ${SHOW_DESC:+'$msg_exit_this_menu'}
75 " # END-QUOTE
76

--- 44 unchanged lines hidden (view full) ---

121 printf " '\''%s'\''", desc
122 }
123 printf "\n"
124 }'
125 )"
126
127 set -f # noglob
128
68 local hline="$hline_arrows_tab_enter"
69 local prompt=""
70
71 RCVAR_MENU_LIST="
72 'X $msg_exit' '$msg_exit_this_menu'
73 ${SHOW_DESC:+'$msg_exit_this_menu'}
74 " # END-QUOTE
75

--- 44 unchanged lines hidden (view full) ---

120 printf " '\''%s'\''", desc
121 }
122 printf "\n"
123 }'
124 )"
125
126 set -f # noglob
127
129 size=$( eval f_dialog_menu_${SHOW_DESC:+with_help_}size \
130 \"\$DIALOG_TITLE\" \
131 \"\$DIALOG_BACKTITLE\" \
132 \"\$prompt\" \
133 \"\$hline\" \
134 $RCVAR_MENU_LIST )
128 local height width rows
129 eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
130 height width rows \
131 \"\$DIALOG_TITLE\" \
132 \"\$DIALOG_BACKTITLE\" \
133 \"\$prompt\" \
134 \"\$hline\" \
135 $RCVAR_MENU_LIST
135
136 local dialog_menu
137 dialog_menu=$( eval $DIALOG \
138 --title \"\$DIALOG_TITLE\" \
139 --backtitle \"\$DIALOG_BACKTITLE\" \
140 --hline \"\$hline\" \
141 --keep-tite \
142 --ok-label \"\$msg_ok\" \
143 --cancel-label \"\$msg_cancel\" \
144 ${SHOW_DESC:+--item-help} \
145 --default-item \"\$DEFAULTITEM_$$\" \
136
137 local dialog_menu
138 dialog_menu=$( eval $DIALOG \
139 --title \"\$DIALOG_TITLE\" \
140 --backtitle \"\$DIALOG_BACKTITLE\" \
141 --hline \"\$hline\" \
142 --keep-tite \
143 --ok-label \"\$msg_ok\" \
144 --cancel-label \"\$msg_cancel\" \
145 ${SHOW_DESC:+--item-help} \
146 --default-item \"\$DEFAULTITEM_$$\" \
146 --menu \"\$prompt\" $size \
147 --menu \"\$prompt\" \
148 $height $width $rows \
147 $RCVAR_MENU_LIST \
148 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
149 )
150 local retval=$?
151 setvar DEFAULTITEM_$$ "$dialog_menu"
152 setvar DIALOG_MENU_$$ "$dialog_menu"
153 return $retval
154}

--- 54 unchanged lines hidden --- 		149 $RCVAR_MENU_LIST \
150 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
151 )
152 local retval=$?
153 setvar DEFAULTITEM_$$ "$dialog_menu"
154 setvar DIALOG_MENU_$$ "$dialog_menu"
155 return $retval
156}

--- 54 unchanged lines hidden ---