Deleted Added
full compact
packages.subr (252987) packages.subr (253333)
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 (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 [ ! "$_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 (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/share/packages/packages.subr 252987 2013-07-07 18:51:44Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/packages/packages.subr 253333 2013-07-14 03:08:52Z 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

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

988 *)
989 case "$name" in
990 *-*|*_*) path="packages/All/$name" ;;
991 *) path="packages/Latest/$name"
992 esac
993 esac
994
995 # We have a path, call the device strategy routine to get the file
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

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

988 *)
989 case "$name" in
990 *-*|*_*) path="packages/All/$name" ;;
991 *) path="packages/Latest/$name"
992 esac
993 esac
994
995 # We have a path, call the device strategy routine to get the file
996 local pkg_ext probe_only=1 found=
996 local pkg_ext found=
997 for pkg_ext in "" $PACKAGE_EXTENSIONS; do
997 for pkg_ext in "" $PACKAGE_EXTENSIONS; do
998 if f_device_get $device "$path$pkg_ext" $probe_only; then
998 if f_device_get $device "$path$pkg_ext" $PROBE_EXIST; then
999 path="$path$pkg_ext"
1000 f_dprintf "%s: found path=[%s] dev=[%s]" \
1001 $fname "$path" "$device"
1002 found=1
1003 break
1004 fi
1005 done
1006

--- 196 unchanged lines hidden ---
999 path="$path$pkg_ext"
1000 f_dprintf "%s: found path=[%s] dev=[%s]" \
1001 $fname "$path" "$device"
1002 found=1
1003 break
1004 fi
1005 done
1006

--- 196 unchanged lines hidden ---