commit c4f016bfd5a03e43e65caa2e9941f4d775225e29 Author: Arturo Filastò art@fuffa.org Date: Fri Jul 3 16:05:46 2015 +0200

Add a connect timeout of 20 seconds --- scripts/install.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh index f55947d..cf86e54 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -57,14 +57,16 @@ fi

curl='' if command_exists curl; then - curl='curl -sSL' + curl='curl --connect-timeout 20 -sSL' elif command_exists wget; then - curl='wget -qO-' + curl='wget --connect-timeout 20 -qO-' elif command_exists busybox && busybox --list-modules | grep -q wget; then - curl='busybox wget -qO-' + curl='busybox wget --connect-timeout 20 -qO-' fi

if ! (curl $TOR_DEB_REPO | grep "Apache Server at deb.torproject.org");then + echo ' The Tor Debian repository deb.torproject.org appears to be blocked.' + echo ' Failing over to using the cloudfronted mirror.' TOR_DEB_REPO="http://d3skbh62gb3f3v.cloudfront.net/torproject.org" fi