*/*: fix completions installed with incorrect filename

chimera-linux · Jul 14, 2024 · 4efee05 · 4efee05
1 parent 7ade145
commit 4efee05
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/contrib/bottom/template.py b/contrib/bottom/template.py
@@ -1,6 +1,6 @@
 pkgname = "bottom"
 pkgver = "0.9.6"
-pkgrel = 0
+pkgrel = 1
 build_style = "cargo"
 hostmakedepends = ["cargo-auditable"]
 makedepends = ["rust-std"]
@@ -29,6 +29,6 @@ def post_install(self):
     self.install_license("LICENSE")
     self.do("gunzip", self.chroot_cwd / "man/btm.1.gz")
     self.install_man("man/btm.1")
-    self.install_completion("completions/btm.bash", "bash")
-    self.install_completion("completions/btm.fish", "fish")
-    self.install_completion("completions/_btm", "zsh")
+    self.install_completion("completions/btm.bash", "bash", "btm")
+    self.install_completion("completions/btm.fish", "fish", "btm")
+    self.install_completion("completions/_btm", "zsh", "btm")
diff --git a/contrib/docker-cli/template.py b/contrib/docker-cli/template.py
@@ -1,6 +1,6 @@
 pkgname = "docker-cli"
 pkgver = "27.0.3"
-pkgrel = 1
+pkgrel = 2
 build_style = "makefile"
 _commit = "7d4bcd863a4c863e650eed02a550dfeb98560b83"
 make_cmd = "gmake"
@@ -49,9 +49,11 @@ def do_install(self):
     dbin = (self.cwd / "build/docker").resolve().name
     self.install_bin(f"build/{dbin}", name="docker")
 
-    self.install_completion("contrib/completion/bash/docker", "bash")
-    self.install_completion("contrib/completion/fish/docker.fish", "fish")
-    self.install_completion("contrib/completion/zsh/_docker", "zsh")
+    self.install_completion("contrib/completion/bash/docker", "bash", "docker")
+    self.install_completion(
+        "contrib/completion/fish/docker.fish", "fish", "docker"
+    )
+    self.install_completion("contrib/completion/zsh/_docker", "zsh", "docker")
 
     self.install_man("man/man1/docker.1")
     self.install_man("man/man1/docker-build.1")

diff --git a/contrib/github-cli/template.py b/contrib/github-cli/template.py
@@ -1,6 +1,6 @@
 pkgname = "github-cli"
 pkgver = "2.52.0"
-pkgrel = 1
+pkgrel = 2
 build_style = "go"
 make_build_args = [
     f"-ldflags=-X github.com/cli/cli/v2/internal/build.Version=v{pkgver}",
@@ -36,6 +36,6 @@ def do_install(self):
     self.install_license("LICENSE")
     self.install_man("man/*.1", glob=True)
 
-    self.install_completion("gh.bash", "bash")
-    self.install_completion("gh.fish", "fish")
-    self.install_completion("gh.zsh", "zsh")
+    self.install_completion("gh.bash", "bash", "gh")
+    self.install_completion("gh.fish", "fish", "gh")
+    self.install_completion("gh.zsh", "zsh", "gh")
diff --git a/contrib/lua5.4-busted/template.py b/contrib/lua5.4-busted/template.py
@@ -1,6 +1,6 @@
 pkgname = "lua5.4-busted"
 pkgver = "2.2.0"
-pkgrel = 0
+pkgrel = 1
 depends = [
     "lua5.4-lua_cliargs",
     "lua5.4-mediator_lua",
@@ -22,6 +22,6 @@
 def do_install(self):
     self.install_bin("bin/busted")
     self.install_files("busted", "usr/share/lua/5.4")
-    self.install_completion("completions/bash/busted.bash", "bash")
-    self.install_completion("completions/zsh/_busted", "zsh")
+    self.install_completion("completions/bash/busted.bash", "bash", "busted")
+    self.install_completion("completions/zsh/_busted", "zsh", "busted")
     self.install_license("LICENSE")
diff --git a/contrib/subversion/template.py b/contrib/subversion/template.py
@@ -1,7 +1,7 @@
 # TODO: service
 pkgname = "subversion"
 pkgver = "1.14.3"
-pkgrel = 1
+pkgrel = 2
 build_style = "gnu_configure"
 configure_args = [
     "--config-cache",
@@ -80,7 +80,7 @@ def post_install(self):
     )
     self.rename("usr/share/pkgconfig", "usr/lib/pkgconfig", relative=False)
     # bash completions
-    self.install_completion("tools/client-side/bash_completion", "bash")
+    self.install_completion("tools/client-side/bash_completion", "bash", "svn")
     for f in [
         "svn",
         "svnadmin",