From 2950bd85cbd1d75965898d25b473f8f1136d4d55 Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 4 Jun 2026 21:17:41 -0400 Subject: [PATCH] Revert "don't attempt with a blank host name in fetch-lua" This reverts commit 9566605ba2c24ab5055f5ba2cce1f559de81e2f8. --- sys/unix/Makefile.top | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index 3a96459b9..239e148d7 100644 --- a/sys/unix/Makefile.top +++ b/sys/unix/Makefile.top @@ -344,8 +344,7 @@ dofiles-nodlb: LUA_URL :=www.lua.org/ftp LUA_URL_MIRROR :=www.tecgraf.puc-rio.br/lua/mirror/ftp LUA_URL_NHD :=www.nethack.org/download/thirdparty -LUA_CEASE_TRYING := __cease_trying__ -LUA_URL_list:=$(LUA_URL) $(LUA_URL_MIRROR) $(LUA_URL_NHD) $(LUA_CEASE_TRYING) +LUA_URL_list:=$(LUA_URL) $(LUA_URL_MIRROR) $(LUA_URL_NHD) # #CURL := curl #ask curl to return a failure code if error 404 is encountered @@ -376,14 +375,13 @@ fetch-Lua: mkdir -p lib && cd lib && \ while [ $$# -gt 0 ]; do \ shift; \ - if [ "$$1" != "$(LUA_CEASE_TRYING)" ]; then \ - if [ $$curlstatus -ne 0 ]; then \ - luaurl=https://$$1/$$luafile; \ - echo Trying $$luaurl; \ - $(CURL) -R -O $$luaurl; \ - curlstatus=$$?; \ - if [ $$curlstatus -eq 0 ]; then \ - if [ ! -z "$$shac" ]; then \ + if [ $$curlstatus -ne 0 ]; then \ + luaurl=https://$$1/$$luafile; \ + echo Trying $$luaurl; \ + $(CURL) -R -O $$luaurl; \ + curlstatus=$$?; \ + if [ $$curlstatus -eq 0 ]; then \ + if [ ! -z "$$shac" ]; then \ CHKSUMS=../submodules/CHKSUMS; \ CHKSUMSTMP=../submodules/CHKSUMS.tmp; \ fgrep $$luafile < $$CHKSUMS > $$CHKSUMSTMP; \ @@ -393,13 +391,10 @@ fetch-Lua: echo Checking integrity of $$luafile with $$shac; \ $$shac -w --ignore-missing -c $$CHKSUMSTMP < $$luafile; \ fi; \ - fi; \ - tar zxf $$luafile && \ - rm -f $$luafile; \ fi; \ + tar zxf $$luafile && \ + rm -f $$luafile; \ fi; \ - else \ - exit 1; \ fi; \ done; \ true )