Merge pull request #16627 from github/criemen/pkg-fix-install

`pkg.bzl`: Fix install targets.

Author: criemen

misc/bazel/internal/install.py

@@ -50,6 +50,7 @@
         for line in manifest:
             prefix, _, zip = line.partition(":")
             assert zip, f"missing prefix for {prefix}, you should use prefix:zip format"
+            zip = zip.strip()
             dest = destdir / prefix
             dest.mkdir(parents=True, exist_ok=True)
             subprocess.run([ripunzip, "unzip-file", zip, "-d", dest], check=True)

misc/bazel/pkg.bzl

@@ -357,14 +357,14 @@ def codeql_pack(
     )
     py_binary(
         name = internal("installer"),
-        srcs = ["//misc/bazel/internal:install.py"],
-        main = "//misc/bazel/internal:install.py",
+        srcs = [Label("//misc/bazel/internal:install.py")],
+        main = Label("//misc/bazel/internal:install.py"),
         data = [
             internal("build-file"),
             internal("script"),
         ] + ([
             internal("zip-manifest"),
-            "//misc/bazel/internal/ripunzip",
+            Label("//misc/bazel/internal/ripunzip"),
         ] if zips else []),
         deps = ["@rules_python//python/runfiles"],
         args = [
@@ -373,7 +373,7 @@ def codeql_pack(
             "--destdir",
             install_dest,
         ] + ([
-            "--ripunzip=$(rlocationpath //misc/bazel/internal/ripunzip)",
+            "--ripunzip=$(rlocationpath %s)" % Label("//misc/bazel/internal/ripunzip"),
             "--zip-manifest=$(rlocationpath %s)" % internal("zip-manifest"),
         ] if zips else []),
         visibility = visibility,