On 9/27/07, Angelo Turetta <[EMAIL PROTECTED]> wrote:
> Attached is a patch with a couple 'cut&paste' typos corrections, plus a
> conditional for not installing fastest_cvsup if you have set
> OVERRIDE_FREEBSD_CVSUP_HOST
>
> Hope this can be included in the repository.
>
> Angelo Turetta
> Modena - Italy
>
> Index: cvsup_current
> ===================================================================
> RCS file: /home/pfsense/cvsroot/tools/builder_scripts/cvsup_current,v
> retrieving revision 1.164
> diff -u -r1.164 cvsup_current
> --- cvsup_current 12 Sep 2007 15:56:57 -0000 1.164
> +++ cvsup_current 27 Sep 2007 14:58:37 -0000
> @@ -81,16 +81,18 @@
> env FTP_PASSIVE_MODE=yes /usr/sbin/pkg_add -r cvsup-without-gui
> fi
>
> +if [ -z ${OVERRIDE_FREEBSD_CVSUP_HOST:-} ]; then
> # Add fastest-cvsup
> if [ ! -f "/usr/local/bin/fastest_cvsup" ]; then
> - echo "Cannot find cvsup, pkg_add in progress..."
> + echo "Cannot find fastest_cvsup, pkg_add in progress..."
> /usr/sbin/pkg_add -r fastest_cvsup
> fi
> # Failed, lets try with passive mode
> if [ ! -f "/usr/local/bin/fastest_cvsup" ]; then
> - echo "Cannot find cvsup, pkg_add in progress (PASSIVE FTP)..."
> + echo "Cannot find fastest_cvsup, pkg_add in progress (PASSIVE FTP)..."
> env FTP_PASSIVE_MODE=yes /usr/sbin/pkg_add -r fastest_cvsup
> fi
> +fi
>
> # Add pcre
> if [ ! -f "/usr/local/lib/libpcre.so.0" ]; then
> @@ -114,7 +116,7 @@
> env FTP_PASSIVE_MODE=yes /usr/sbin/pkg_add -r lighttpd
> fi
>
> -# Add cvsup
> +# Add curl
> if [ ! -f "/usr/local/bin/curl" ]; then
> echo "Cannot find curl, pkg_add in progress..."
> /usr/sbin/pkg_add -r curl
Commited, thanks!
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
