diff options
Diffstat (limited to 'usr.sbin/bsdconfig/startup')
-rwxr-xr-x | usr.sbin/bsdconfig/startup/misc | 17 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcadd | 8 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcconf | 16 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcdelete | 40 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/rcvar | 2 | ||||
-rw-r--r-- | usr.sbin/bsdconfig/startup/share/rcconf.subr | 13 | ||||
-rwxr-xr-x | usr.sbin/bsdconfig/startup/startup | 10 |
7 files changed, 49 insertions, 57 deletions
diff --git a/usr.sbin/bsdconfig/startup/misc b/usr.sbin/bsdconfig/startup/misc index 01c0a4c..7659d5f 100755 --- a/usr.sbin/bsdconfig/startup/misc +++ b/usr.sbin/bsdconfig/startup/misc @@ -56,19 +56,14 @@ UNAME_P=$( uname -p ) # Processor Architecture (i.e. i386) # dialog_menu_main() { - local menu_list var_list defaultitem= - local hline="$hline_arrows_tab_enter" local prompt="$msg_miscellaneous_menu_text" - - # Obtain default-item (adjusted below for dynamic tags) - f_dialog_default_fetch defaultitem - local ditem="${defaultitem%%[$IFS]*}" - - menu_list=" + local menu_list=" 'X <<< $msg_exit' '$msg_exit_this_menu' " # END-QUOTE + local defaultitem= # Calculated below + local hline="$hline_arrows_tab_enter" - var_list=" + local var_list=" accounting_enable local_startup lpd_enable @@ -88,6 +83,10 @@ dialog_menu_main() " # END-QUOTE fi + # Obtain default-item (adjusted below for dynamic tags) + f_dialog_default_fetch defaultitem + local ditem="${defaultitem%%[$IFS]*}" + eval "$( . "$RC_DEFAULTS" source_rc_confs diff --git a/usr.sbin/bsdconfig/startup/rcadd b/usr.sbin/bsdconfig/startup/rcadd index f26c7e3..dd3aeb2 100755 --- a/usr.sbin/bsdconfig/startup/rcadd +++ b/usr.sbin/bsdconfig/startup/rcadd @@ -57,14 +57,12 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # dialog_menu_main() { - local menu_list - local hline="$hline_arrows_tab_enter" - local prompt="" - - menu_list=" + local prompt= + local menu_list=" '1' '$msg_add_from_list' '2' '$msg_add_custom' " # END-QUOTE + local hline="$hline_arrows_tab_enter" local height width rows eval f_dialog_menu_size height width rows \ diff --git a/usr.sbin/bsdconfig/startup/rcconf b/usr.sbin/bsdconfig/startup/rcconf index 3b84531..6a41b7e 100755 --- a/usr.sbin/bsdconfig/startup/rcconf +++ b/usr.sbin/bsdconfig/startup/rcconf @@ -49,7 +49,6 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # RCCONF_MAP= _RCCONF_MAP= -RCCONF_MENU_LIST= # # Options @@ -79,11 +78,8 @@ fi # dialog_menu_main() { - local hline="$hline_arrows_tab_enter" - local prompt="" - local defaultitem= # Calculated below - - RCCONF_MENU_LIST=" + local prompt= + local menu_list=" 'X $msg_exit' '$msg_exit_desc' ${SHOW_DESC:+'$msg_exit_help'} '> $msg_add_new' '$msg_add_new_desc' @@ -95,6 +91,8 @@ dialog_menu_main() ${SHOW_DESC:+'$msg_view_details_help'} } " # END-QUOTE + local defaultitem= # Calculated below + local hline="$hline_arrows_tab_enter" if [ ! "$_RCCONF_MAP" ]; then # Genreate RCCONF_MAP of `var desc ...' per-line @@ -110,7 +108,7 @@ dialog_menu_main() [ "$SHOW_DEFAULT_VALUE" -o "$SHOW_CONFIGURED" ] && f_dialog_info "$msg_creating_menu_list" - RCCONF_MENU_LIST="$RCCONF_MENU_LIST $( + menu_list="$menu_list $( . "$RC_DEFAULTS" > /dev/null source_rc_confs > /dev/null var_list=$( f_startup_rcconf_list ) @@ -169,7 +167,7 @@ dialog_menu_main() \"\$DIALOG_BACKTITLE\" \ \"\$prompt\" \ \"\$hline\" \ - $RCCONF_MENU_LIST + $menu_list # Obtain default-item from previously stored selection f_dialog_default_fetch defaultitem @@ -187,7 +185,7 @@ dialog_menu_main() --default-item \"\$defaultitem\" \ --menu \"\$prompt\" \ $height $width $rows \ - $RCCONF_MENU_LIST \ + $menu_list \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD ) local retval=$? diff --git a/usr.sbin/bsdconfig/startup/rcdelete b/usr.sbin/bsdconfig/startup/rcdelete index db935eb..76701c8 100755 --- a/usr.sbin/bsdconfig/startup/rcdelete +++ b/usr.sbin/bsdconfig/startup/rcdelete @@ -146,9 +146,23 @@ dialog_create_main() # dialog_menu_main() { - local hline="$hline_arrows_tab_enter" - local prompt="" + local prompt= + local menu_list=" + 'X $msg_exit_cancel' '$msg_exit_cancel_desc' + ${SHOW_DESC:+'$msg_exit_cancel_help'} + '> $msg_delete_selected' '$msg_delete_selected_desc' + ${SHOW_DESC:+'$msg_delete_selected_help'} + '> $msg_all' '$msg_all_desc' + ${SHOW_DESC:+'$msg_all_help'} + '> $msg_none' '$msg_none_desc' + ${SHOW_DESC:+'$msg_none_help'} + ${USE_XDIALOG:+ + '> $msg_view_details' '$msg_view_details_desc' + ${SHOW_DESC:+'$msg_view_details_help'} + } + " # END-QUOTE local defaultitem= # Calculated below + local hline="$hline_arrows_tab_enter" # # [Re-]Accent the menu list before incorporating it @@ -178,22 +192,7 @@ dialog_menu_main() menu_buf="$menu_buf '$rcconf_var' '$details' ${SHOW_DESC:+'$help'}" # End-Quote done - - local menu_list=" - 'X $msg_exit_cancel' '$msg_exit_cancel_desc' - ${SHOW_DESC:+'$msg_exit_cancel_help'} - '> $msg_delete_selected' '$msg_delete_selected_desc' - ${SHOW_DESC:+'$msg_delete_selected_help'} - '> $msg_all' '$msg_all_desc' - ${SHOW_DESC:+'$msg_all_help'} - '> $msg_none' '$msg_none_desc' - ${SHOW_DESC:+'$msg_none_help'} - ${USE_XDIALOG:+ - '> $msg_view_details' '$msg_view_details_desc' - ${SHOW_DESC:+'$msg_view_details_help'} - } - $menu_buf - " # END-QUOTE + menu_list="$menu_list $menu_buf" set -f # noglob (descriptions in $RCCONF_MENU_LIST may contain *) @@ -244,9 +243,9 @@ dialog_menu_main() # dialog_menu_confirm_delete() { - local hline="$hline_arrows_tab_enter" local prompt="$msg_are_you_sure_you_want_delete_the_following" - local var_list menu_list + local menu_list # Calculated below + local hline="$hline_arrows_tab_enter" [ $# -ge 1 ] || return $FAILURE @@ -255,6 +254,7 @@ dialog_menu_confirm_delete() return $? fi + local var_list var_list=$( for var in $*; do echo "$var"; done | sort -u ) menu_list=$( . "$RC_DEFAULTS" diff --git a/usr.sbin/bsdconfig/startup/rcvar b/usr.sbin/bsdconfig/startup/rcvar index 67748dd..a7b32b3 100755 --- a/usr.sbin/bsdconfig/startup/rcvar +++ b/usr.sbin/bsdconfig/startup/rcvar @@ -65,8 +65,8 @@ RCVAR_MENU_LIST= # dialog_menu_main() { + local prompt= local hline="$hline_arrows_tab_enter" - local prompt="" local defaultitem= # Calculated below RCVAR_MENU_LIST=" diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr index ed8553a..6cfe509 100644 --- a/usr.sbin/bsdconfig/startup/share/rcconf.subr +++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr @@ -273,15 +273,16 @@ f_startup_rcconf_map_expand() # f_dialog_input_view_details() { - local menu_list + local prompt= + local menu_list # calculated below + local defaultitem= # calculated below local hline="$hline_arrows_tab_enter" - local prompt="" local md=" " if [ "$SHOW_DESC" ]; then md="X" fi - local m1=" " m2=" " m3=" " defaultitem= + local m1=" " m2=" " m3=" " if [ "$SHOW_VALUE" ]; then m1="*" defaultitem="1 ($m1) $msg_show_value" @@ -367,13 +368,11 @@ f_dialog_input_view_details() # f_dialog_input_rclist() { - local hline="$hline_arrows_tab_enter" local prompt="$msg_please_select_an_rcconf_directive" - local menu_list - - menu_list=" + local menu_list=" 'X $msg_exit' '' ${SHOW_DESC:+'$msg_exit_help'} " # END-QUOTE + local hline="$hline_arrows_tab_enter" if [ ! "$_RCCONF_MAP" ]; then # Generate RCCONF_MAP of `var desc ...' per-line diff --git a/usr.sbin/bsdconfig/startup/startup b/usr.sbin/bsdconfig/startup/startup index 15bd66a..55a78a6 100755 --- a/usr.sbin/bsdconfig/startup/startup +++ b/usr.sbin/bsdconfig/startup/startup @@ -48,17 +48,15 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ) # dialog_menu_main() { - local menu_list - local hline="$hline_arrows_tab_enter" - local prompt="" - local defaultitem= # Calculated below - - menu_list=" + local prompt= + local menu_list=" 'X' '$msg_exit' '1' '$msg_toggle_startup_services' '2' '$msg_view_edit_startup_configuration' '3' '$msg_miscellaneous_startup_services' " # END-QUOTE + local defaultitem= # Calculated below + local hline="$hline_arrows_tab_enter" local height width rows eval f_dialog_menu_size height width rows \ |