Deleted Added
full compact
rcvar (251236) rcvar (251244)
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 251236 2013-06-01 23:58:44Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/startup/rcvar 251244 2013-06-02 09:02:12Z 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

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

62# dialog_menu_main
63#
64# Display the dialog(1)-based application main menu.
65#
66dialog_menu_main()
67{
68 local hline="$hline_arrows_tab_enter"
69 local prompt=""
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

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

62# dialog_menu_main
63#
64# Display the dialog(1)-based application main menu.
65#
66dialog_menu_main()
67{
68 local hline="$hline_arrows_tab_enter"
69 local prompt=""
70 local defaultitem= # Calculated below
70
71 RCVAR_MENU_LIST="
72 'X $msg_exit' '$msg_exit_this_menu'
73 ${SHOW_DESC:+'$msg_exit_this_menu'}
74 " # END-QUOTE
75
76 if [ ! "$_RCVAR_MAP" ]; then
77 # Generate RCVAR_MAP of `rcvar dflt script desc ...' per-line

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

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
136
71
72 RCVAR_MENU_LIST="
73 'X $msg_exit' '$msg_exit_this_menu'
74 ${SHOW_DESC:+'$msg_exit_this_menu'}
75 " # END-QUOTE
76
77 if [ ! "$_RCVAR_MAP" ]; then
78 # Generate RCVAR_MAP of `rcvar dflt script desc ...' per-line

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

130 eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
131 height width rows \
132 \"\$DIALOG_TITLE\" \
133 \"\$DIALOG_BACKTITLE\" \
134 \"\$prompt\" \
135 \"\$hline\" \
136 $RCVAR_MENU_LIST
137
138 # Obtain default-item from previously stored selection
139 f_dialog_default_fetch defaultitem
140
137 local menu_choice
138 menu_choice=$( eval $DIALOG \
141 local menu_choice
142 menu_choice=$( 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_$$\" \
147 --menu \"\$prompt\" \
148 $height $width $rows \
149 $RCVAR_MENU_LIST \
143 --title \"\$DIALOG_TITLE\" \
144 --backtitle \"\$DIALOG_BACKTITLE\" \
145 --hline \"\$hline\" \
146 --keep-tite \
147 --ok-label \"\$msg_ok\" \
148 --cancel-label \"\$msg_cancel\" \
149 ${SHOW_DESC:+--item-help} \
150 --default-item \"\$defaultitem\" \
151 --menu \"\$prompt\" \
152 $height $width $rows \
153 $RCVAR_MENU_LIST \
150 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
151 )
152 local retval=$?
153 f_dialog_data_sanitize menu_choice
154 f_dialog_menutag_store "$menu_choice"
154 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
155 )
156 local retval=$?
157 f_dialog_data_sanitize menu_choice
158 f_dialog_menutag_store "$menu_choice"
155 setvar DEFAULTITEM_$$ "$menu_choice"
159 f_dialog_default_store "$menu_choice"
156 return $retval
157}
158
159############################################################ MAIN
160
161# Incorporate rc-file if it exists
162[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
163

--- 45 unchanged lines hidden ---
160 return $retval
161}
162
163############################################################ MAIN
164
165# Incorporate rc-file if it exists
166[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
167

--- 45 unchanged lines hidden ---