Deleted Added
full compact
index.subr (258265) index.subr (258267)
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: head/usr.sbin/bsdconfig/share/packages/index.subr 258265 2013-11-17 17:42:15Z dteske $
27# $FreeBSD: head/usr.sbin/bsdconfig/share/packages/index.subr 258267 2013-11-17 17:53:55Z dteske $
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

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

101
102 #
103 # Generate $PACKAGESITE variable for pkg(8) based on media type
104 #
105 local __type __data __site
106 device_media get type __type
107 device_media get private __data
108 case "$__type" in
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

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

101
102 #
103 # Generate $PACKAGESITE variable for pkg(8) based on media type
104 #
105 local __type __data __site
106 device_media get type __type
107 device_media get private __data
108 case "$__type" in
109 $DEVICE_TYPE_UFS|$DEVICE_TYPE_DISK) __site="file://$MOUNTPOINT" ;;
110 $DEVICE_TYPE_DIRECTORY) __site="file://$__data" ;;
111 $DEVICE_TYPE_FLOPPY) __site="file://${__data:-$MOUNTPOINT}" ;;
112 $DEVICE_TYPE_FTP) f_getvar $VAR_FTP_PATH __site ;;
113 $DEVICE_TYPE_HTTP_PROXY) f_getvar $VAR_HTTP_PROXY_PATH __site ;;
114 $DEVICE_TYPE_HTTP) f_getvar $VAR_HTTP_PATH __site ;;
115 $DEVICE_TYPE_CDROM) __site="file://$MOUNTPOINT" ;;
116 $DEVICE_TYPE_USB) __site="file://$MOUNTPOINT" ;;
117 $DEVICE_TYPE_DOS) __site="file://$MOUNTPOINT" ;;
118 $DEVICE_TYPE_NFS) __site="file://$MOUNTPOINT" ;;
109 $DEVICE_TYPE_DIRECTORY)
110 __site="file://$__data/packages/$PKG_ABI" ;;
111 $DEVICE_TYPE_FLOPPY)
112 __site="file://${__data:-$MOUNTPOINT}/packages/$PKG_ABI" ;;
113 $DEVICE_TYPE_FTP)
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 *) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
123 __site="file://$MOUNTPOINT/packages/$PKG_ABI"
119 esac
120
121 export PACKAGESITE="$__site"
122 f_dprintf "PACKAGESITE=[%s]" "$PACKAGESITE"
123 if ! f_eval_catch $__funcname pkg "pkg update"; then
124 f_show_err "$msg_unable_to_update_pkg_from_selected_media"
125 f_device_shutdown media
126 return $FAILURE

--- 335 unchanged lines hidden ---
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"
130 f_device_shutdown media
131 return $FAILURE

--- 335 unchanged lines hidden ---