Deleted Added
full compact
functions-packages.sh (211730) functions-packages.sh (212337)
1#!/bin/sh
2#-
3# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
4#
5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions
7# are met:
8# 1. Redistributions of source code must retain the above copyright

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

18# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24# SUCH DAMAGE.
25#
1#!/bin/sh
2#-
3# Copyright (c) 2010 iXsystems, Inc. All rights reserved.
4#
5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions
7# are met:
8# 1. Redistributions of source code must retain the above copyright

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

18# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24# SUCH DAMAGE.
25#
26# $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions-packages.sh 211730 2010-08-24 06:11:46Z imp $
26# $FreeBSD: head/usr.sbin/pc-sysinstall/backend/functions-packages.sh 212337 2010-09-08 20:10:24Z imp $
27
28# Functions which runs commands on the system
29
30. ${BACKEND}/functions.sh
31. ${BACKEND}/functions-parse.sh
32. ${BACKEND}/functions-ftp.sh
33
34

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

108 exit_err "ERROR: Install medium was set to ftp, but no ftpDir was provided!"
109 fi
110
111 FTPDIR="${VAL}"
112 FTPPATH="ftp://${FTPHOST}${FTPDIR}"
113
114 case "${INSTALLMEDIUM}" in
115 usb|dvd) get_package_index_by_fs ;;
27
28# Functions which runs commands on the system
29
30. ${BACKEND}/functions.sh
31. ${BACKEND}/functions-parse.sh
32. ${BACKEND}/functions-ftp.sh
33
34

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

108 exit_err "ERROR: Install medium was set to ftp, but no ftpDir was provided!"
109 fi
110
111 FTPDIR="${VAL}"
112 FTPPATH="ftp://${FTPHOST}${FTPDIR}"
113
114 case "${INSTALLMEDIUM}" in
115 usb|dvd) get_package_index_by_fs ;;
116 ftp|sftp) get_package_index_by_ftp "${FTPPATH}" ;;
116 ftp) get_package_index_by_ftp "${FTPPATH}" ;;
117 sftp) ;;
117 *) RES=1 ;;
118 esac
119
120 fi
121
122 return ${RES}
123};
124

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

364fetch_package()
365{
366 CATEGORY="${1}"
367 PACKAGE="${2}"
368 SAVEDIR="${3}"
369
370 case "${INSTALLMEDIUM}" in
371 usb|dvd) fetch_package_by_fs "${CATEGORY}" "${PACKAGE}" "${SAVEDIR}" ;;
118 *) RES=1 ;;
119 esac
120
121 fi
122
123 return ${RES}
124};
125

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

365fetch_package()
366{
367 CATEGORY="${1}"
368 PACKAGE="${2}"
369 SAVEDIR="${3}"
370
371 case "${INSTALLMEDIUM}" in
372 usb|dvd) fetch_package_by_fs "${CATEGORY}" "${PACKAGE}" "${SAVEDIR}" ;;
372 ftp|sftp) fetch_package_by_ftp "${CATEGORY}" "${PACKAGE}" "${SAVEDIR}" ;;
373 ftp) fetch_package_by_ftp "${CATEGORY}" "${PACKAGE}" "${SAVEDIR}" ;;
374 sftp) ;;
373 esac
374};
375 esac
376};