Deleted Added
full compact
index.subr (258420) index.subr (259533)
1if [ ! "$_PACKAGES_INDEX_SUBR" ]; then _PACKAGES_INDEX_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_INDEX_SUBR" ]; then _PACKAGES_INDEX_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: stable/10/usr.sbin/bsdconfig/share/packages/index.subr 258420 2013-11-21 03:38:47Z dteske $
27# $FreeBSD: stable/10/usr.sbin/bsdconfig/share/packages/index.subr 259533 2013-12-18 01:14:25Z gjb $
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." packages/index.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/media/common.subr

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

114 f_getvar $VAR_FTP_PATH __site
115 __site="$__site/packages/$PKG_ABI" ;;
116 $DEVICE_TYPE_HTTP)
117 f_getvar $VAR_HTTP_PATH __site
118 __site="$__site/$PKG_ABI/latest" ;;
119 $DEVICE_TYPE_HTTP_PROXY)
120 f_getvar $VAR_HTTP_PROXY_PATH __site
121 __site="$__site/packages/$PKG_ABI" ;;
28#
29############################################################ INCLUDES
30
31BSDCFG_SHARE="/usr/share/bsdconfig"
32. $BSDCFG_SHARE/common.subr || exit 1
33f_dprintf "%s: loading includes..." packages/index.subr
34f_include $BSDCFG_SHARE/device.subr
35f_include $BSDCFG_SHARE/media/common.subr

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

114 f_getvar $VAR_FTP_PATH __site
115 __site="$__site/packages/$PKG_ABI" ;;
116 $DEVICE_TYPE_HTTP)
117 f_getvar $VAR_HTTP_PATH __site
118 __site="$__site/$PKG_ABI/latest" ;;
119 $DEVICE_TYPE_HTTP_PROXY)
120 f_getvar $VAR_HTTP_PROXY_PATH __site
121 __site="$__site/packages/$PKG_ABI" ;;
122 $DEVICE_TYPE_CDROM)
123 __site="file://$MOUNTPOINT/packages/$PKG_ABI"
124 export REPOS_DIR="$MOUNTPOINT/packages/repos" ;;
122 *) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
123 __site="file://$MOUNTPOINT/packages/$PKG_ABI"
124 esac
125
126 export PACKAGESITE="$__site"
127 f_dprintf "PACKAGESITE=[%s]" "$PACKAGESITE"
128 if ! f_eval_catch $__funcname pkg "pkg update"; then
129 f_show_err "$msg_unable_to_update_pkg_from_selected_media"

--- 337 unchanged lines hidden ---
125 *) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
126 __site="file://$MOUNTPOINT/packages/$PKG_ABI"
127 esac
128
129 export PACKAGESITE="$__site"
130 f_dprintf "PACKAGESITE=[%s]" "$PACKAGESITE"
131 if ! f_eval_catch $__funcname pkg "pkg update"; then
132 f_show_err "$msg_unable_to_update_pkg_from_selected_media"

--- 337 unchanged lines hidden ---