Deleted Added
sdiff udiff text old ( 241701 ) new ( 241899 )
full compact
bsdconfig (241701) bsdconfig (241899)
1#!/bin/sh
2#-
3# Copyright (c) 2012 Ron McDowell
4# Copyright (c) 2012 Devin Teske
5# All rights reserved.
6#
7# Redistribution and use in source and binary forms, with or without
8# modification, are permitted provided that the following conditions

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

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

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

20# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26# SUCH DAMAGE.
27#
28# $FreeBSD: head/usr.sbin/bsdconfig/bsdconfig 241701 2012-10-18 18:43:54Z dteske $
28# $FreeBSD: head/usr.sbin/bsdconfig/bsdconfig 241899 2012-10-22 18:01:38Z dteske $
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr
36f_include $BSDCFG_SHARE/strings.subr
37
38BSDCFG_LIBE="/usr/libexec/bsdconfig"
39f_include_lang $BSDCFG_LIBE/include/messages.subr
29#
30############################################################ INCLUDES
31
32BSDCFG_SHARE="/usr/share/bsdconfig"
33. $BSDCFG_SHARE/common.subr || exit 1
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/mustberoot.subr
36f_include $BSDCFG_SHARE/strings.subr
37
38BSDCFG_LIBE="/usr/libexec/bsdconfig"
39f_include_lang $BSDCFG_LIBE/include/messages.subr
40f_include_help $BSDCFG_LIBE/include/bsdconfig.hlp
40f_include_help BSDCONFIG $BSDCFG_LIBE/include/bsdconfig.hlp
41f_include_help USAGE $BSDCFG_LIBE/include/usage.hlp
41
42############################################################ FUNCTIONS
43
44# usage
45#
46# display usage and exit
47#
48usage()

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

136dialog_menu_main()
137{
138 local title="$DIALOG_TITLE"
139 local btitle="$DIALOG_BACKTITLE"
140 local prompt="$msg_menu_text"
141 local menu_list size
142
143 menu_list="
42
43############################################################ FUNCTIONS
44
45# usage
46#
47# display usage and exit
48#
49usage()

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

137dialog_menu_main()
138{
139 local title="$DIALOG_TITLE"
140 local btitle="$DIALOG_BACKTITLE"
141 local prompt="$msg_menu_text"
142 local menu_list size
143
144 menu_list="
144 'X' '$msg_exit' '$msg_exit_bsdconfig'
145 'X' '$msg_exit' '$msg_exit_bsdconfig'
146 '1' '$msg_usage' '$msg_quick_start_how_to_use_this_menu_system'
145 " # END-QUOTE
146
147 local sanitize_awk="{ gsub(/'/, \"'\\\\''\"); print }"
148
147 " # END-QUOTE
148
149 local sanitize_awk="{ gsub(/'/, \"'\\\\''\"); print }"
150
149 local menuitem menu_title menu_help menu_selection index=1
151 local menuitem menu_title menu_help menu_selection index=2
150 for menuitem in $( ls -d [0-9][0-9][0-9].* ); do
151 [ $index -lt ${#DIALOG_MENU_TAGS} ] || break
152 tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
153
154 menu_program=
155 menu_title=
156 menu_help=
157 f_include_lang $menuitem/INDEX

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

182 dialog_menu=$( eval $DIALOG \
183 --clear \
184 --title \"\$title\" \
185 --backtitle \"\$btitle\" \
186 --item-help \
187 --ok-label \"\$msg_ok\" \
188 --cancel-label \"\$msg_exit_bsdconfig\" \
189 --help-button \
152 for menuitem in $( ls -d [0-9][0-9][0-9].* ); do
153 [ $index -lt ${#DIALOG_MENU_TAGS} ] || break
154 tag=$( f_substr "$DIALOG_MENU_TAGS" $index 1 )
155
156 menu_program=
157 menu_title=
158 menu_help=
159 f_include_lang $menuitem/INDEX

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

184 dialog_menu=$( eval $DIALOG \
185 --clear \
186 --title \"\$title\" \
187 --backtitle \"\$btitle\" \
188 --item-help \
189 --ok-label \"\$msg_ok\" \
190 --cancel-label \"\$msg_exit_bsdconfig\" \
191 --help-button \
190 ${USE_XDIALOG:+--help \"\$( f_include_help )\"} \
192 ${USE_XDIALOG:+--help \"\$( f_include_help BSDCONFIG )\"} \
191 --menu \"\$prompt\" $size $menu_list \
192 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
193 )
194 local retval=$?
195 setvar DIALOG_MENU_$$ "$dialog_menu"
196 return $retval
197}
198

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

295while :; do
296 dialog_menu_main
297 retval=$?
298 mtag=$( f_dialog_menutag )
299 f_dprintf "retval=$retval mtag=[$mtag]"
300
301 if [ $retval -eq 2 ]; then
302 # The Help button was pressed
193 --menu \"\$prompt\" $size $menu_list \
194 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
195 )
196 local retval=$?
197 setvar DIALOG_MENU_$$ "$dialog_menu"
198 return $retval
199}
200

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

297while :; do
298 dialog_menu_main
299 retval=$?
300 mtag=$( f_dialog_menutag )
301 f_dprintf "retval=$retval mtag=[$mtag]"
302
303 if [ $retval -eq 2 ]; then
304 # The Help button was pressed
303 f_show_msg "%s" "$( f_include_help )"
305 f_show_msg "%s" "$( f_include_help BSDCONFIG )"
304 continue
305 elif [ $retval -ne 0 ]; then
306 f_die
307 fi
308
309 case "$mtag" in
310 X) # Exit
311 break
312 ;;
313
306 continue
307 elif [ $retval -ne 0 ]; then
308 f_die
309 fi
310
311 case "$mtag" in
312 X) # Exit
313 break
314 ;;
315
316 1) # Usage
317 f_show_msg "%s" "$( f_include_help USAGE )"
318 continue
319 ;;
320
314 *) # Dynamically loaded menuitem
315 cmd=$( eval echo \"\$menu_program$mtag\" )
316 f_dprintf "cmd=[$cmd]"
317 $cmd ${USE_XDIALOG:+-X}
318 ;;
319
320 esac
321done
322
323exit $SUCCESS
324
325################################################################################
326# END
327################################################################################
321 *) # Dynamically loaded menuitem
322 cmd=$( eval echo \"\$menu_program$mtag\" )
323 f_dprintf "cmd=[$cmd]"
324 $cmd ${USE_XDIALOG:+-X}
325 ;;
326
327 esac
328done
329
330exit $SUCCESS
331
332################################################################################
333# END
334################################################################################