Deleted Added
full compact
rcedit.subr (240684) rcedit.subr (240768)
1if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _STARTUP_RCEDIT_SUBR=1
2#
3# Copyright (c) 2012 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 (INCLUDING, 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#
1if [ ! "$_STARTUP_RCEDIT_SUBR" ]; then _STARTUP_RCEDIT_SUBR=1
2#
3# Copyright (c) 2012 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 (INCLUDING, 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/share/rcedit.subr 240684 2012-09-18 22:28:42Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/startup/share/rcedit.subr 240768 2012-09-20 23:44:13Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_include $BSDCFG_SHARE/dialog.subr
34f_include $BSDCFG_SHARE/sysrc.subr
35

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

72 "$DIALOG_BACKTITLE" \
73 "$msg" \
74 "$_input" \
75 "$hline" )
76
77 local opterm="--"
78 [ "$USE_XDIALOG" ] && opterm=
79
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_include $BSDCFG_SHARE/dialog.subr
34f_include $BSDCFG_SHARE/sysrc.subr
35

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

72 "$DIALOG_BACKTITLE" \
73 "$msg" \
74 "$_input" \
75 "$hline" )
76
77 local opterm="--"
78 [ "$USE_XDIALOG" ] && opterm=
79
80 eval $DIALOG \
80 local dialog_inputbox
81 dialog_inputbox=$( eval $DIALOG \
81 --title \"\$DIALOG_TITLE\" \
82 --backtitle \"\$DIALOG_BACKTITLE\" \
83 --hline \"\$hline\" \
84 --ok-label \"\$msg_ok\" \
85 --cancel-label \"\$msg_cancel\" \
86 --inputbox \"\$msg\" $size \
87 $opterm \"\$_input\" \
82 --title \"\$DIALOG_TITLE\" \
83 --backtitle \"\$DIALOG_BACKTITLE\" \
84 --hline \"\$hline\" \
85 --ok-label \"\$msg_ok\" \
86 --cancel-label \"\$msg_cancel\" \
87 --inputbox \"\$msg\" $size \
88 $opterm \"\$_input\" \
88 2> $DIALOG_TMPDIR/dialog.inputbox.$$
89 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
90 )
89
90 retval=$?
91
92 retval=$?
93 setvar DIALOG_INPUTBOX_$$ "$dialog_inputbox"
91 _input=$( f_dialog_inputstr )
92
93 # Return if user has either pressed ESC or chosen Cancel/No
94 [ $retval -eq $SUCCESS ] || return $retval
95
96 # Return if the value has not changed from current
97 local cur_val="$( f_sysrc_get "$var" )"
98 [ "$_input" = "$cur_val" ] && return $SUCCESS
99
100 f_dprintf "$var: [$cur_val]->[$_input]"
101
102 err=$( f_sysrc_set "$var" "$_input" 2>&1 ) ||
103 f_show_msg "$err"
104}
105
106fi # ! $_STARTUP_RCEDIT_SUBR
94 _input=$( f_dialog_inputstr )
95
96 # Return if user has either pressed ESC or chosen Cancel/No
97 [ $retval -eq $SUCCESS ] || return $retval
98
99 # Return if the value has not changed from current
100 local cur_val="$( f_sysrc_get "$var" )"
101 [ "$_input" = "$cur_val" ] && return $SUCCESS
102
103 f_dprintf "$var: [$cur_val]->[$_input]"
104
105 err=$( f_sysrc_set "$var" "$_input" 2>&1 ) ||
106 f_show_msg "$err"
107}
108
109fi # ! $_STARTUP_RCEDIT_SUBR