From 2af52002d037fe895c2d6db22c2428b4d38b2c95 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Sat, 19 Mar 2011 09:13:25 -0700 Subject: [PATCH] Change downloads from using wget to using curl. build.sh: remove unecessary / at end of directory name. setup.py: remove unecessary / at end of dir name. --- build.sh | 6 +++--- setup.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sh b/build.sh index ae24780..173e342 100755 --- a/build.sh +++ b/build.sh @@ -21,7 +21,7 @@ yyyymmdd=`date +%F | sed -e 's|-||g'` # todays year, month, and day cppad_tarball='cppad-20110101.2.gpl.tgz' # local_cppad_directory.gpl.tgz cppad_parent_dir=`pwd` # parrent of local_cppad_directory log_dir=`pwd` # write build.sh logs in here -cppad_download_dir='http://www.coin-or.org/download/source/CppAD/' +cppad_download_dir='http://www.coin-or.org/download/source/CppAD' omhelp_download_dir='http://www.seanet.com/~bradbell' # ---------------------------------------------------------------------------- # Update setup.py so it corresponds to current build.sh options above. @@ -64,8 +64,8 @@ then echo "rm OMhelp.unix.tar.gz" rm OMhelp.unix.tar.gz fi - echo "wget $omhelp_download_dir/OMhelp.unix.tar.gz" - wget "$omhelp_download_dir/OMhelp.unix.tar.gz" + echo "curl -O $omhelp_download_dir/OMhelp.unix.tar.gz" + curl -O "$omhelp_download_dir/OMhelp.unix.tar.gz" # echo "tar -xzf OMhelp.unix.tar.gz" tar -xzf OMhelp.unix.tar.gz diff --git a/setup.py b/setup.py index 18a6aeb..def3202 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ # Values in setup.py that are replaced by build.sh package_version = '20110319' cppad_tarball = 'cppad-20110101.2.gpl.tgz' -cppad_download_dir = 'http://www.coin-or.org/download/source/CppAD/' +cppad_download_dir = 'http://www.coin-or.org/download/source/CppAD' # --------------------------------------------------------------------- import re import sys @@ -71,12 +71,12 @@ if not os.access( cppad_include_dir , os.R_OK ) : print 'os.getcwd() = ' + os.getcwd() print 'Please wait while the proper version of CppAD is downloaded' - cmd = 'wget --no-clobber -P ' + cppad_parent_dir - cmd = cmd + ' ' + cppad_download_dir + '/' + cppad_tarball + cmd = '( cd ' + cppad_parent_dir + ';' + cmd = cmd + ' curl -O ' + cppad_download_dir + '/' + cppad_tarball + ')' print cmd os.system( cmd ) - cmd = 'tar -C ' + cppad_parent_dir - cmd = cmd + ' -xzf ' + cppad_parent_dir + '/' + cppad_tarball + cmd = '( cd ' + cppad_parent_dir + ';' + cmd = cmd + ' tar -xzf ' + cppad_parent_dir + '/' + cppad_tarball + ')' print cmd os.system( cmd ) if not os.access( cppad_include_dir , os.R_OK ) :