From 884606e74bee007c0286a16fb8aa8fc8af9a8779 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 5 Oct 2015 17:44:10 +0200 Subject: 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 Tested-by: Eike Rathke --- Makefile.fetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.fetch') 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 -- cgit v1.2.3