Deleted Added
full compact
packages.subr (252773) packages.subr (252774)
1if [ ! "$_PACKAGES_PACKAGES_SUBR" ]; then _PACKAGES_PACKAGES_SUBR=1
2#
3# Copyright (c) 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#
1if [ ! "$_PACKAGES_PACKAGES_SUBR" ]; then _PACKAGES_PACKAGES_SUBR=1
2#
3# Copyright (c) 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/share/packages/packages.subr 252773 2013-07-05 06:24:18Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 252774 2013-07-05 06:46:11Z 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/device.subr

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

876 fi
877 f_str2varname "$name" varpkg
878 fi
879
880 # If invoked through the scripted interface, we likely have not yet
881 # detected the installed packages -- something we should do only once.
882 #
883 if [ ! "$PACKAGES_DETECTED" ]; then
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/device.subr

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

876 fi
877 f_str2varname "$name" varpkg
878 fi
879
880 # If invoked through the scripted interface, we likely have not yet
881 # detected the installed packages -- something we should do only once.
882 #
883 if [ ! "$PACKAGES_DETECTED" ]; then
884 f_dprintf "f_package_add: Detecting installed packages"
884 f_package_detect_installed
885 export PACKAGES_DETECTED=1 # exported for awk(1) ENVIRON[]
886 fi
887 # Now we have: _mark_{varpkg}=X for all installed packages
888
889 #
890 # Since we're maintaining data structures for installed packages,
891 # short-circuit the package dependency checks if the package is already

--- 172 unchanged lines hidden ---
885 f_package_detect_installed
886 export PACKAGES_DETECTED=1 # exported for awk(1) ENVIRON[]
887 fi
888 # Now we have: _mark_{varpkg}=X for all installed packages
889
890 #
891 # Since we're maintaining data structures for installed packages,
892 # short-circuit the package dependency checks if the package is already

--- 172 unchanged lines hidden ---