From cd6e27d1392acbc56366561fda2bf939e492f16a Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 15 Jun 2019 00:34:09 +0800 Subject: fix installer.nsi comment and improve http --- scripts/installer.nsi | 2 +- xmake/modules/net/http/download.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/installer.nsi b/scripts/installer.nsi index a24d12ab5..14e64700f 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -119,7 +119,7 @@ Section "xmake (required)" Installer File /r /x ".DS_Store" /x "*.swp" "..\xmake\*.*" File "..\*.md" File "..\core\build\xmake.exe" - File /r /x ".DS_Store" "..\winenv" ; put bin\unzip, bin\curl + File /r /x ".DS_Store" "..\winenv" ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\NSIS_xmake "Install_Dir" "$INSTDIR" diff --git a/xmake/modules/net/http/download.lua b/xmake/modules/net/http/download.lua index 5a911c24f..90aadcaf5 100644 --- a/xmake/modules/net/http/download.lua +++ b/xmake/modules/net/http/download.lua @@ -97,7 +97,7 @@ end function main(url, outputfile) -- init output file - outputfile = outputfile or path.filename(url) + outputfile = outputfile or path.filename(url):gsub("%?.+$", "") -- attempt to download url using curl first local tool = find_tool("curl", {version = true}) -- cgit v1.3.1