fix: cleanup in node_repositories.bzl

bazel-contrib · Nov 12, 2019 · d341869 · d341869
1 parent 1117b6f
commit d341869
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/internal/node/node_repositories.bzl b/internal/node/node_repositories.bzl
@@ -285,15 +285,14 @@ def _download_node(repository_ctx):
     node_urls = repository_ctx.attr.node_urls
 
     # Download node & npm
-    node_host_version = "{}-{}".format(node_version, host)
-    if node_host_version in node_repositories:
-        filename, strip_prefix, sha256 = node_repositories[node_host_version]
-    else:
-        fail("Unknown NodeJS host/version {}".format(node_host_version))
+    version_host_os = "%s-%s" % (node_version, host_os)
+    if not version_host_os in node_repositories:
+        fail("Unknown NodeJS version-host %s" % version_host_os)
+    filename, strip_prefix, sha256 = node_repositories[version_host_os]
 
     repository_ctx.download_and_extract(
         url = [url.format(version = node_version, filename = filename) for url in node_urls],
-        output = NODE_DIR,
+        output = NODE_EXTRACT_DIR,
         stripPrefix = strip_prefix,
         sha256 = sha256,
     )
@@ -314,11 +313,11 @@ def _download_yarn(repository_ctx):
     if yarn_version in yarn_repositories:
         filename, strip_prefix, sha256 = yarn_repositories[yarn_version]
     else:
-        fail("Unknown Yarn version {}".format(yarn_version))
+        fail("Unknown Yarn version %s" % yarn_version)
 
     repository_ctx.download_and_extract(
         url = [url.format(version = yarn_version, filename = filename) for url in yarn_urls],
-        output = YARN_DIR,
+        output = YARN_EXTRACT_DIR,
         stripPrefix = strip_prefix,
         sha256 = sha256,
     )
@@ -361,8 +360,8 @@ def _prepare_node(repository_ctx):
             "lib/node_modules/npm/bin/npm-cli.js" if not is_windows else "node_modules/npm/bin/npm-cli.js",
         ] if f])
     else:
-        node_exec = "{}/bin/node".format(NODE_DIR) if not is_windows else "{}/node.exe".format(NODE_DIR)
-        npm_script = "{}/lib/node_modules/npm/bin/npm-cli.js".format(NODE_DIR) if not is_windows else "{}/node_modules/npm/bin/npm-cli.js".format(NODE_DIR)
+        node_exec = ("%s/bin/node" % NODE_EXTRACT_DIR) if not is_windows else ("%s/node.exe" % NODE_EXTRACT_DIR)
+        npm_script = ("%s/lib/node_modules/npm/bin/npm-cli.js" % NODE_EXTRACT_DIR) if not is_windows else ("%s/node_modules/npm/bin/npm-cli.js" % NODE_EXTRACT_DIR)
         node_exec_label = node_exec
     if repository_ctx.attr.vendored_yarn:
         yarn_script = "/".join([f for f in [
@@ -373,7 +372,7 @@ def _prepare_node(repository_ctx):
             "bin/yarn.js",
         ] if f])
     else:
-        yarn_script = "{}/bin/yarn.js".format(YARN_DIR)
+        yarn_script = "%s/bin/yarn.js" % YARN_EXTRACT_DIR
     node_entry = "bin/node" if not is_windows else "bin/node.cmd"
     npm_node_repositories_entry = "bin/npm_node_repositories" if not is_windows else "bin/npm_node_repositories.cmd"
     yarn_node_repositories_entry = "bin/yarn_node_repositories" if not is_windows else "bin/yarn_node_repositories.cmd"
@@ -428,8 +427,8 @@ CALL "%SCRIPT_DIR%\\{node}" {args} %*
 # Immediately exit if any command fails.
 set -e
 # Generated by node_repositories.bzl
-export NODE_REPOSITORY_ARGS={}
-""".format(node_repo_args), executable = True)
+export NODE_REPOSITORY_ARGS={args}
+""".format(args = node_repo_args), executable = True)
 
     # The entry points for npm for osx/linux and windows
     # Runs npm using appropriate node entry point
@@ -630,7 +629,7 @@ def _nodejs_host_os_alias_impl(repository_ctx):
     else:
         node_bin_repository = node_repository
         actual_node_bin = "%s/%s" % (
-            NODE_DIR,
+            NODE_EXTRACT_DIR,
             "node.exe" if is_windows_host else "bin/node",
         )
     repository_ctx.template(