diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-05 17:44:10 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-10-06 18:19:36 +0000 |
| commit | 884606e74bee007c0286a16fb8aa8fc8af9a8779 (patch) | |
| tree | 56ec9aa81132afd6fedcea9ea9d8a7905eeab6f0 | |
| parent | 3eff65e78a3a90b07c7a01ff26736fd25996e476 (diff) | |
Makefile.fetch: explicitly invoke bash for $PIPESTATUS
Since commit 5067d31364695d892d4290afb039a9877450fccb the SHELL variable
is no longer set to bash in Makefile.in, so $PIPESTATUS is empty and the
fetch command fails due to syntax error (as reported by Olivier Hallot).
Since i have no idea how to implement the equivalent of $PIPESTATUS for
shells that lack it, just invoke bash explicitly here.
Change-Id: I7e27377e54c7e19175abcbec0beefca31a55a2bd
Reviewed-on: https://gerrit.libreoffice.org/19164
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | Makefile.fetch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 8429228af43e..44d8aad8b525 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,12 +11,12 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& $(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] +&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef else define fetch_Download__wget_command -&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] +&& echo fetching $2 && bash -c '$(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef endif |