From 5afd2e8c000d53f86c05aaa8b5c669f698b937e3 Mon Sep 17 00:00:00 2001 From: Stefano Mazzocchi Date: Tue, 6 Apr 2010 23:05:45 +0000 Subject: [PATCH] hmm, let's see if this fixes the problem that David is seeing but I can't repro git-svn-id: http://google-refine.googlecode.com/svn/trunk@396 7d457c2a-affb-35e4-300a-418c747d4874 --- gridworks | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gridworks b/gridworks index b4c198fe7..22dd031bd 100755 --- a/gridworks +++ b/gridworks @@ -111,16 +111,18 @@ get_url_file() { download() { URL=$1 DEST=$2 + CURL="`which curl`" + WGET="`which wget`" - if [ `which curl` == "" ] && [ `which wget` == "" ]; then + if [ $CURL == "" ] && [ $WGET == "" ]; then error "We need either 'curl' or 'wget' present in PATH to download external dependencies." fi - if [ `which curl` != "" ] ; then + if [ $CURL != "" ] ; then curl -o $DEST $URL || exit 1 fi - if [ `which wget` != "" ] ; then + if [ $WGET != "" ] ; then wget -O $DEST $URL || exit 1 fi }