Skip to content

Commit 6810d76

Browse files
committed
Fix bin folder for nodejs
Signed-off-by: Uilian Ries <uilianries@gmail.com>
1 parent 13569c8 commit 6810d76

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

recipes/nodejs/all/conandata.yml

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
sources:
22
"12.14.1":
3-
- os: "Windows"
4-
url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-win-x64.zip"
3+
- url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-win-x64.zip"
54
sha256: "1f96ccce3ba045ecea3f458e189500adb90b8bc1a34de5d82fc10a5bf66ce7e3"
6-
- os: "Linux"
7-
url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-linux-x64.tar.xz"
5+
- url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-linux-x64.tar.xz"
86
sha256: "07cfcaa0aa9d0fcb6e99725408d9e0b07be03b844701588e3ab5dbc395b98e1b"
9-
- os: "Macos"
10-
url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-darwin-x64.tar.gz"
7+
- url: "https://nodejs.org/dist/v12.14.1/node-v12.14.1-darwin-x64.tar.gz"
118
sha256: "0be10a28737527a1e5e3784d3ad844d742fe8b0718acd701fd48f718fd3af78f"
129
"13.6.0":
13-
- os: "Windows"
14-
url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-win-x64.zip"
10+
- url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-win-x64.zip"
1511
sha256: "7fe37b34a4673a071bea52fcaf913ec422cf6fd79fd025bfb22de42ccc77f386"
16-
- os: "Linux"
17-
url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-linux-x64.tar.xz"
12+
- url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-linux-x64.tar.xz"
1813
sha256: "00f01315a867da16d1638f7a02966c608e344ac6c5b7d04d1fdae3138fa9d798"
19-
- os: "Macos"
20-
url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-darwin-x64.tar.gz"
14+
- url: "https://nodejs.org/dist/v13.6.0/node-v13.6.0-darwin-x64.tar.gz"
2115
sha256: "da13adb864777b322dda7af20410a9b0c63aa69de4b5574008d1e6910768bf69"

recipes/nodejs/all/conanfile.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ def _source_subfolder(self):
1818
return os.path.join(self.source_folder, "source_subfolder")
1919

2020
def source(self):
21+
os_name = {"Windows": "-win", "Macos": "-darwin", "Linux": "-linux"}
2122
for data in self.conan_data["sources"][self.version]:
22-
oss, sha, url = data.values()
23+
sha, url = data.values()
2324
filename = url[url.rfind("/")+1:]
2425
tools.download(url, filename)
2526
tools.check_sha256(filename, sha)
26-
if self.settings.os_build == oss:
27-
os.rename(filename[:filename.rfind(".")], self._source_subfolder)
27+
if os_name[str(self.settings.os_build)] in url:
28+
tools.unzip(filename)
29+
os.rename(filename[:filename.rfind("x64")+3], self._source_subfolder)
2830

2931
def package(self):
3032
self.copy(pattern="LICENSE", dst="licenses", src=self._source_subfolder)

0 commit comments

Comments
 (0)