Deleted Added
full compact
rcadd (251190) rcadd (251236)
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/rcadd 251190 2013-05-31 19:07:17Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/startup/rcadd 251236 2013-06-01 23:58:44Z 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

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

69 local height width rows
70 eval f_dialog_menu_size height width rows \
71 \"\$DIALOG_TITLE\" \
72 \"\$DIALOG_BACKTITLE\" \
73 \"\$prompt\" \
74 \"\$hline\" \
75 $menu_list
76
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

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

69 local height width rows
70 eval f_dialog_menu_size height width rows \
71 \"\$DIALOG_TITLE\" \
72 \"\$DIALOG_BACKTITLE\" \
73 \"\$prompt\" \
74 \"\$hline\" \
75 $menu_list
76
77 local dialog_menu
78 dialog_menu=$( eval $DIALOG \
77 local menu_choice
78 menu_choice=$( eval $DIALOG \
79 --title \"\$DIALOG_TITLE\" \
80 --backtitle \"\$DIALOG_BACKTITLE\" \
81 --hline \"\$hline\" \
82 --ok-label \"\$msg_ok\" \
83 --cancel-label \"\$msg_cancel\" \
84 --menu \"\$prompt\" \
85 $height $width $rows \
86 $menu_list \
87 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
88 )
89 local retval=$?
79 --title \"\$DIALOG_TITLE\" \
80 --backtitle \"\$DIALOG_BACKTITLE\" \
81 --hline \"\$hline\" \
82 --ok-label \"\$msg_ok\" \
83 --cancel-label \"\$msg_cancel\" \
84 --menu \"\$prompt\" \
85 $height $width $rows \
86 $menu_list \
87 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
88 )
89 local retval=$?
90 setvar DIALOG_MENU_$$ "$dialog_menu"
90 f_dialog_menutag_store -s "$menu_choice"
91 return $retval
92}
93
94############################################################ MAIN
95
96# Incorporate rc-file if it exists
97[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
98

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

112f_dialog_title "$msg_add_startup_directive"
113f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
114f_mustberoot_init
115
116#
117# Launch application main menu
118#
119while :; do
91 return $retval
92}
93
94############################################################ MAIN
95
96# Incorporate rc-file if it exists
97[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
98

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

112f_dialog_title "$msg_add_startup_directive"
113f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
114f_mustberoot_init
115
116#
117# Launch application main menu
118#
119while :; do
120 dialog_menu_main
121 retval=$?
122 mtag=$( f_dialog_menutag )
120 dialog_menu_main || f_die
121 f_dialog_menutag_fetch mtag
123
122
124 [ $retval -eq 0 ] || f_die
125
126 case "$mtag" in
127 1) # Add From List
128 # Loop for easy return
129 while :; do
123 case "$mtag" in
124 1) # Add From List
125 # Loop for easy return
126 while :; do
130 f_dialog_input_rclist
131 retval=$?
132 mtag=$( f_dialog_menutag )
127 f_dialog_input_rclist || break
128 f_dialog_menutag_fetch mtag
133
129
134 [ $retval -eq 0 ] || break
135
136 case "$mtag" in
137 "X $msg_exit" ) break ;;
138 *) # Anything else is a directive
139 rcvar="${mtag# }"
140 $BSDCFG_LIBE/$APP_DIR/rcedit \
141 ${USE_XDIALOG:+-X} \
142 "$rcvar" || continue
143 esac

--- 17 unchanged lines hidden ---
130 case "$mtag" in
131 "X $msg_exit" ) break ;;
132 *) # Anything else is a directive
133 rcvar="${mtag# }"
134 $BSDCFG_LIBE/$APP_DIR/rcedit \
135 ${USE_XDIALOG:+-X} \
136 "$rcvar" || continue
137 esac

--- 17 unchanged lines hidden ---