diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2015-09-18 06:09:37 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2015-09-18 06:09:37 (GMT) |
commit | 164e7435c92cf483c77b0ff7b5092a9382a70ebe (patch) | |
tree | 852f00b87f2255e5c61278eda350d22c0bb8f01c /Makefile | |
parent | bec5b6c734756f981e98666ec52343277f4fbd2e (diff) | |
download | mxe-164e7435c92cf483c77b0ff7b5092a9382a70ebe.zip mxe-164e7435c92cf483c77b0ff7b5092a9382a70ebe.tar.gz mxe-164e7435c92cf483c77b0ff7b5092a9382a70ebe.tar.bz2 |
report downloading from backup
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -168,14 +168,16 @@ ESCAPE_PKG = \ echo '$($(1)_FILE)' | perl -lpe 's/([^A-Za-z0-9])/sprintf("%%%02X", ord($$$$1))/seg' BACKUP_DOWNLOAD = \ - $(WGET) -O- $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \ - $(WGET) -O- $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))` + (echo "MXE Warning! Downloading $(1) from backup." >&2 && \ + ($(WGET) -O- $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \ + $(WGET) -O- $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`)) DOWNLOAD_PKG_ARCHIVE = \ mkdir -p '$(PKG_DIR)' && ( \ $(WGET) -T 30 -t 3 -O- '$($(1)_URL)' \ $(if $($(1)_URL_2), \ - || $(WGET) -T 30 -t 3 -O- '$($(1)_URL_2)') \ + || (echo "MXE Warning! Downloading $(1) from second URL." >&2 && \ + $(WGET) -T 30 -t 3 -O- '$($(1)_URL_2)')) \ $(if $(MXE_NO_BACKUP_DL),, \ || $(BACKUP_DOWNLOAD)) \ ) \ @@ -344,6 +346,7 @@ download-only-$(1): @if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ $(PRINTF_FMT) '[download]' '$(1)'; \ ($(call DOWNLOAD_PKG_ARCHIVE,$(1))) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ + grep 'MXE Warning' '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \ ln -sf '$(TIMESTAMP)/$(1)-download' '$(LOG_DIR)/$(1)-download'; \ if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ echo; \ |