diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-12-05 08:40:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 08:40:19 (GMT) |
| commit | 62de2147b39f04284a8c66e086550d74ed3b1901 (patch) | |
| tree | e46f0d32c0b3aeb62ab1bd3db123441879c37db7 | |
| parent | eeed35b5f1efd709b00ce416ff782a5a8cc90399 (diff) | |
| parent | 894608bf4dae46d6b140037df5a75f68bdf81fc0 (diff) | |
| download | mxe-62de2147b39f04284a8c66e086550d74ed3b1901.zip mxe-62de2147b39f04284a8c66e086550d74ed3b1901.tar.gz mxe-62de2147b39f04284a8c66e086550d74ed3b1901.tar.bz2 | |
Merge pull request #1584 from LuaAndC/fix-appended-download
pkg download: do not append to previous attempt
| -rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -230,29 +230,30 @@ ESCAPE_PKG = \ BACKUP_DOWNLOAD = \ (echo "MXE Warning! Downloading $(1) from backup." >&2 && \ - ($(WGET) -O- $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \ - $(WGET) -O- $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`)) + ($(WGET) -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' $(PKG_MIRROR)/`$(call ESCAPE_PKG,$(1))` || \ + $(WGET) -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' $(PKG_CDN)/`$(call ESCAPE_PKG,$(1))`)) DOWNLOAD_PKG_ARCHIVE = \ $(if $($(1)_SOURCE_TREE),\ true\ $(else),\ mkdir -p '$(PKG_DIR)' && ( \ - $(WGET) -T 30 -t 3 -O- '$($(1)_URL)' \ + $(WGET) -T 30 -t 3 -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' '$($(1)_URL)' \ $(if $($(1)_URL_2), \ || (echo "MXE Warning! Downloading $(1) from second URL." >&2 && \ - $(WGET) -T 30 -t 3 -O- '$($(1)_URL_2)')) \ + $(WGET) -T 30 -t 3 -O '$(PKG_DIR)/.tmp-$($(1)_FILE)' '$($(1)_URL_2)')) \ $(if $(MXE_NO_BACKUP_DL),, \ || $(BACKUP_DOWNLOAD)) \ - ) \ + ) && cat '$(PKG_DIR)/.tmp-$($(1)_FILE)' \ $(if $($(1)_FIX_GZIP), \ | gzip -d | gzip -9n, \ ) \ - > '$(PKG_DIR)/$($(1)_FILE)' || \ + > '$(PKG_DIR)/$($(1)_FILE)' && \ + rm '$(PKG_DIR)/.tmp-$($(1)_FILE)' || \ ( echo; \ echo 'Download failed!'; \ echo; \ - rm -f '$(PKG_DIR)/$($(1)_FILE)'; )\ + rm -f '$(PKG_DIR)/$($(1)_FILE)' '$(PKG_DIR)/.tmp-$($(1)_FILE)'; )\ ) # open issue from 2002: |