diff options
| author | ruki <[email protected]> | 2019-06-15 00:34:09 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-06-14 21:24:54 +0800 |
| commit | cd6e27d1392acbc56366561fda2bf939e492f16a (patch) | |
| tree | 37406ffd235fb4a8e124ea50e49fc99df46fc6a5 | |
| parent | 7832cdea276c9699d2b708b3e02ff1d5d443f138 (diff) | |
fix installer.nsi comment and improve http
| -rw-r--r-- | scripts/installer.nsi | 2 | ||||
| -rw-r--r-- | 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}) |