[gnuastro-commits] master 1e8d39a3 2/2: Book: downloading dependency tarballs with wget command

[Mohammad Akhlaghi]

branch: master
commit 1e8d39a38e5a0d43fe1af5c4f43b5fcd29e31634
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Book: downloading dependency tarballs with wget command
    
    Until now, readers needed to click on the URL to download the source
    tarballs of three mandatory dependencies. Afterwards, they needed to go to
    their download directory run the rest of the commands. Besides being
    inconvenient, this has recently started to cause problems with
    WCSLIB. Because WCSLIB's source is distributed in an FTP server and newer
    versions of the browsers don't support FTP any more.
    
    With this commit, the downloading of the source files has been brough into
    the code box as a 'wget' command. This removes the need for a browser over
    all, making it more convenient, and also avoiding the FTP problem (wget
    supports FTP and has no plans to remove it).
    
    This was reported by Fernando Buitrago.
---
 doc/announce-acknowledge.txt |  1 +
 doc/gnuastro.texi            | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index 3bc50981..7c39fd36 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -2,6 +2,7 @@ Alphabetically ordered list to acknowledge in the next release.
 
 Faezeh Bidjarchian
 Alejandro Serrano Borlaff
+Fernando Buitrago
 Sepideh Eskandarlou
 Zohreh Ghaffari
 Giulia Golini
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index e87d1824..39d6745e 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -7792,9 +7792,10 @@ In this section we explain each program and any specific 
note that might be nece
 
 @cindex GNU Scientific Library
 The @url{http://www.gnu.org/software/gsl/, GNU Scientific Library}, or GSL, is 
a large collection of functions that are very useful in scientific 
applications, for example, integration, random number generation, and Fast 
Fourier Transform among many others.
-To install GSL from source, you can run the following commands after you have 
downloaded @url{http://ftpmirror.gnu.org/gsl/gsl-latest.tar.gz, 
@file{gsl-latest.tar.gz}}:
+To download and install GSL from source, you can run the following commands.
 
 @example
+$ wget http://ftpmirror.gnu.org/gsl/gsl-latest.tar.gz
 $ tar xf gsl-latest.tar.gz
 $ cd gsl-X.X                     # Replace X.X with version number.
 $ ./configure CFLAGS="$CFLAGS -g0 -O3"
@@ -7833,10 +7834,11 @@ The commands below will compile and install them on 
your system along with CFITS
 They are not essential for Gnuastro, since they are just wrappers for 
functions within CFITSIO, but they can come in handy.
 The @command{make utils} command is only available for versions above 3.39, it 
will build these executable files along with several other executable test 
files which are deleted in the following commands before the installation 
(otherwise the test files will also be installed).
 
-The commands necessary to decompress, build and install CFITSIO from source 
are described below.
-Let's assume you have downloaded 
@url{http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio_latest.tar.gz, 
@file{cfitsio_latest.tar.gz}} and are in the same directory:
+The commands necessary to download the source, decompress, build and install 
CFITSIO from source are described below.
 
 @example
+$ urlbase=http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c
+$ wget $urlbase/cfitsio_latest.tar.gz
 $ tar xf cfitsio_latest.tar.gz
 $ cd cfitsio-X.XX                   # Replace X.XX with version
 $ ./configure --prefix=/usr/local --enable-sse2 --enable-reentrant \
@@ -7891,8 +7893,10 @@ If you have the cURL library 
@footnote{@url{https://curl.haxx.se}} on your syste
 CFITSIO uses the cURL library for its HTTPS (or HTTP 
Secure@footnote{@url{https://en.wikipedia.org/wiki/HTTPS}}) support and if it 
is present on your system, CFITSIO will depend on it.
 Therefore, if @command{./configure} command below fails (you do not have the 
cURL library), then remove this option and rerun it.
 
-Let's assume you have downloaded 
@url{ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2, 
@file{wcslib.tar.bz2}} and are in the same directory, to configure, build, 
check and install WCSLIB follow the steps below.
+To download, configure, build, check and install WCSLIB from source, you can 
follow the steps below.
 @example
+## Download and unpack the source tarball
+$ wget ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2
 $ tar xf wcslib.tar.bz2
 
 ## In the `cd' command, replace `X.X' with version number.