diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-11-28 22:47:58 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-11-29 08:54:25 +0000 |
| commit | 1e002d8c56a3d45ff8a22006cabc3fefb54780d6 (patch) | |
| tree | ee809cad1fc46fbee890758d2ef66f432ca77b46 /Makefile.fetch | |
| parent | 8b2dfe517571fdf001a54ad6b10feb1badac6815 (diff) | |
use $PIPESTATUS instead of pipefail option
as pipefail is not supported in bash 2.x (used on Mac/PPC)
Change-Id: Iaeaed7d759be700719fb941b13942e4933c5ee71
Reviewed-on: https://gerrit.libreoffice.org/1190
Reviewed-by: Matúš Kukan <matus.kukan@gmail.com>
Tested-by: Matúš Kukan <matus.kukan@gmail.com>
Diffstat (limited to 'Makefile.fetch')
| -rw-r--r-- | Makefile.fetch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 1babbf5f42c7..249502d209dd 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 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) +&& $(WGET) --progress=dot:mega -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) +&& echo fetching $2 && $(CURL) -O $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] endef endif @@ -39,7 +39,6 @@ endif define fetch__Download_item $(if $(wildcard $(TARFILE_LOCATION)/$2),, \ cd $(TARFILE_LOCATION)/tmp \ -&& set -o pipefail \ $(call fetch_Download__wget_command,$1,$2) \ $(if $3,$(call fetch_Download__checksum_command,$2,$3)) \ && mv $2 ../ \ |