Merge branch 'master' into v1.4

This commit is contained in:
Ken Rice 2015-05-26 09:58:13 -05:00
commit 9c3d33c67e
2 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@ if [ -f "$WGET" ] ; then
DOWNLOAD_CMD=$WGET DOWNLOAD_CMD=$WGET
else else
if [ -f "$CURL" ] ; then if [ -f "$CURL" ] ; then
DOWNLOAD_CMD="$CURL -O" DOWNLOAD_CMD="$CURL -L -O"
fi fi
fi fi

View File

@ -12,7 +12,7 @@ if [ -x "$WGET" ]; then
DOWNLOAD_CMD=$WGET DOWNLOAD_CMD=$WGET
fi fi
if [ "x${DOWNLOAD_CMD}" = "x" -a -x "$CURL" ] ; then if [ "x${DOWNLOAD_CMD}" = "x" -a -x "$CURL" ] ; then
DOWNLOAD_CMD="$CURL -O" DOWNLOAD_CMD="$CURL -L -O"
fi fi
base=http://files.freeswitch.org/ base=http://files.freeswitch.org/