From 52c9a534851a19f7f71a3894d796b29620906d03 Mon Sep 17 00:00:00 2001
From: Xavier Antoviaque <xavier@antoviaque.org>
Date: Thu, 6 Jun 2013 18:09:04 -0300
Subject: [PATCH] Install: Make curl options more consistent, add logging of errors
The options passed to curl were not always the same - added logging of
error (-S) everywhere (was only used for Mac before) and made it quiet
in the rare few cases where it wasn't yet (-s).
---
scripts/create-dev-env.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh
index 11703fa..513e269 100755
--- a/scripts/create-dev-env.sh
+++ b/scripts/create-dev-env.sh
@@ -357,7 +357,7 @@ fi
# rvm has issues in debian family, this is taken from stack overflow
case `uname -s` in
Darwin)
- curl -sL get.rvm.io | bash -s -- --version 1.15.7
+ curl -sSL get.rvm.io | bash -s -- --version 1.15.7
;;
[Ll]inux)
@@ -472,8 +472,8 @@ SCIPY_VER="0.10.1"
if [[ -n $compile ]]; then
output "Downloading numpy and scipy"
- curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz
- curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz
+ curl -sSL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz
+ curl -sSL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz
tar xf numpy.tar.gz
tar xf scipy.tar.gz
rm -f numpy.tar.gz scipy.tar.gz
@@ -492,7 +492,7 @@ DISTRIBUTE_VER="0.6.28"
output "Building Distribute"
SITE_PACKAGES="$HOME/.virtualenvs/edx-platform/lib/python2.7/site-packages"
cd "$SITE_PACKAGES"
-curl -OL http://pypi.python.org/packages/source/d/distribute/distribute-${DISTRIBUTE_VER}.tar.gz
+curl -sSLO http://pypi.python.org/packages/source/d/distribute/distribute-${DISTRIBUTE_VER}.tar.gz
tar -xzvf distribute-${DISTRIBUTE_VER}.tar.gz
cd distribute-${DISTRIBUTE_VER}
python setup.py install
--
libgit2 0.26.0