Deleted Added
full compact
variable.subr (256361) variable.subr (260675)
1if [ ! "$_VARIABLE_SUBR" ]; then _VARIABLE_SUBR=1
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 (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 [ ! "$_VARIABLE_SUBR" ]; then _VARIABLE_SUBR=1
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 (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: stable/10/usr.sbin/bsdconfig/share/variable.subr 256361 2013-10-11 23:12:05Z dteske $
27# $FreeBSD: stable/10/usr.sbin/bsdconfig/share/variable.subr 260675 2014-01-15 07:36:34Z dteske $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." variable.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/strings.subr

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

174# requested (by setting $debug to non-NULL), otherwise false.
175#
176f_debugging()
177{
178 local value
179 f_getvar $VAR_DEBUG value && [ "$value" ]
180}
181
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." variable.subr
34f_include $BSDCFG_SHARE/dialog.subr
35f_include $BSDCFG_SHARE/strings.subr

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

174# requested (by setting $debug to non-NULL), otherwise false.
175#
176f_debugging()
177{
178 local value
179 f_getvar $VAR_DEBUG value && [ "$value" ]
180}
181
182# f_interactive()
182# f_interactive
183#
184# Are we running interactively? Return error if $nonInteractive is set and non-
185# NULL, otherwise return success.
186#
187f_interactive()
188{
189 local value
190 ! f_getvar $VAR_NONINTERACTIVE value || [ ! "$value" ]
191}
192
183#
184# Are we running interactively? Return error if $nonInteractive is set and non-
185# NULL, otherwise return success.
186#
187f_interactive()
188{
189 local value
190 ! f_getvar $VAR_NONINTERACTIVE value || [ ! "$value" ]
191}
192
193# f_netinteractive()
193# f_netinteractive
194#
195# Has the user specifically requested the network-portion of configuration and
196# setup to be performed interactively? Returns success if the user has asked
197# for the network configuration to be done interactively even if perhaps over-
198# all non-interactive mode has been requested (by setting nonInteractive).
199#
200# Returns success if $netInteractive is set and non-NULL.
201#
202f_netinteractive()
203{
204 local value
205 f_getvar $VAR_NETINTERACTIVE value && [ "$value" ]
206}
207
194#
195# Has the user specifically requested the network-portion of configuration and
196# setup to be performed interactively? Returns success if the user has asked
197# for the network configuration to be done interactively even if perhaps over-
198# all non-interactive mode has been requested (by setting nonInteractive).
199#
200# Returns success if $netInteractive is set and non-NULL.
201#
202f_netinteractive()
203{
204 local value
205 f_getvar $VAR_NETINTERACTIVE value && [ "$value" ]
206}
207
208# f_zfsinteractive()
208# f_zfsinteractive
209#
210# Has the user specifically requested the ZFS-portion of configuration and
211# setup to be performed interactively? Returns success if the user has asked
212# for the ZFS configuration to be done interactively even if perhaps overall
213# non-interactive mode has been requested (by setting nonInteractive).
214#
215# Returns success if $zfsInteractive is set and non-NULL.
216#

--- 80 unchanged lines hidden ---
209#
210# Has the user specifically requested the ZFS-portion of configuration and
211# setup to be performed interactively? Returns success if the user has asked
212# for the ZFS configuration to be done interactively even if perhaps overall
213# non-interactive mode has been requested (by setting nonInteractive).
214#
215# Returns success if $zfsInteractive is set and non-NULL.
216#

--- 80 unchanged lines hidden ---