Deleted Added
full compact
packages.subr (252741) packages.subr (252742)
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 252741 2013-07-05 01:30:13Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 252742 2013-07-05 01:32:39Z 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/packages/categories.subr

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

615 --menu \"\$prompt\" \
616 $height $width $rows \
617 $menu_list \
618 2> /dev/null || return $?
619 # Return if the user pressed ESC or chose Cancel/No
620
621 #
622 # Process each of the selected packages:
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/packages/categories.subr

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

615 --menu \"\$prompt\" \
616 $height $width $rows \
617 $menu_list \
618 2> /dev/null || return $?
619 # Return if the user pressed ESC or chose Cancel/No
620
621 #
622 # Process each of the selected packages:
623 # + First, process dependencies.
624 # + Second, process packages marked for Install.
625 # + Third, process packages marked for Re-install.
623 # + First, process packages marked for Install.
624 # + Second, process packages marked for Re-install.
626 # + Finally, process packages marked for Uninstall.
627 #
628 for package in $SELECTED_PACKAGES; do
629 mark=
630 f_str2varname "$package" varpkg
631 f_getvar _mark_$varpkg mark
625 # + Finally, process packages marked for Uninstall.
626 #
627 for package in $SELECTED_PACKAGES; do
628 mark=
629 f_str2varname "$package" varpkg
630 f_getvar _mark_$varpkg mark
632 [ "$mark" = "D" ] || continue
633 # XXX Install dependency
634 f_package_deselect "$package"
635 done
636 for package in $SELECTED_PACKAGES; do
637 mark=
638 f_str2varname "$package" varpkg
639 f_getvar _mark_$varpkg mark
640 [ "$mark" = "I" ] || continue
641 # XXX Install package
642 f_package_deselect "$package"
643 done
644 for package in $SELECTED_PACKAGES; do
645 mark=
646 f_str2varname "$package" varpkg
647 f_getvar _mark_$varpkg mark

--- 181 unchanged lines hidden ---
631 [ "$mark" = "I" ] || continue
632 # XXX Install package
633 f_package_deselect "$package"
634 done
635 for package in $SELECTED_PACKAGES; do
636 mark=
637 f_str2varname "$package" varpkg
638 f_getvar _mark_$varpkg mark

--- 181 unchanged lines hidden ---