Skip to content

Commit 7aea020

Browse files
committed
Fix hardcoded sha1sum command and compare sha1 value
1 parent 68301c3 commit 7aea020

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

mk/external.mk

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,26 @@ QUAKE_DATA_VERIFY = echo "$(strip $$($(T)_DATA_SHA1)) $$@" | $(SHA1SUM) -c
2323
# Timidity software synthesizer configuration for SDL2_mixer
2424
TIMIDITY_DATA_URL = http://www.libsdl.org/projects/mixer/timidity/timidity.tar.gz
2525
TIMIDITY_DATA = $(OUT)/timidity
26-
TIMIDITY_DATA_SHA1 = cdd30736508d26968222a6414f3beabc3b7a0725
26+
TIMIDITY_DATA_SHA1 = cf6217a5d824b717ec4a07e15e6c129a4657ca25
2727
TIMIDITY_DATA_EXTRACT = tar -xf $(notdir $($(T)_DATA_URL)) -C $(OUT)
28-
TIMIDITY_TMP_FILE = /tmp/timidity_sha1.txt
29-
TIMIDITY_DATA_VERIFY = echo "$(TIMIDITY_DATA_SHA1)" > $(TIMIDITY_TMP_FILE) | find $(TIMIDITY_DATA) -type f -print0 | sort -z | xargs -0 shasum | shasum | cut -f 1 -d ' '
28+
TIMIDITY_TMP_FILE1 = /tmp/timidity_sha1.txt
29+
TIMIDITY_TMP_FILE2 = /tmp/timidity_sha2.txt
30+
TIMIDITY_DATA_VERIFY = echo "$(TIMIDITY_DATA_SHA1)" > $(TIMIDITY_TMP_FILE1) \
31+
| find $(TIMIDITY_DATA) -type f -print0 \
32+
| sort -z \
33+
| xargs -0 $(SHA1SUM) \
34+
| sort \
35+
| $(SHA1SUM) \
36+
| cut -f 1 -d ' ' > $(TIMIDITY_TMP_FILE2) \
37+
&& cmp $(TIMIDITY_TMP_FILE1) $(TIMIDITY_TMP_FILE2)
3038

3139
define download-n-extract
3240
$($(T)_DATA):
3341
$(VECHO) " GET\t$$@\n"
3442
$(Q)curl --progress-bar -O -L -C - "$(strip $($(T)_DATA_URL))"
3543
$(Q)$($(T)_DATA_EXTRACT)
3644
$(Q)$($(T)_DATA_VERIFY)
37-
$(Q)$(RM) $(notdir $($(T)_DATA_URL)) $($(T)_TMP_FILE)
45+
$(Q)$(RM) $(notdir $($(T)_DATA_URL)) $($(T)_TMP_FILE1) $($(T)_TMP_FILE2)
3846
endef
3947

4048
EXTERNAL_DATA = DOOM QUAKE TIMIDITY

0 commit comments

Comments
 (0)