bash-completion: regenerate patch (#19313)

and add maintainer
termux · Feb 21, 2024 · 1a16585 · 1a16585
1 parent d253997
commit 1a16585
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/packages/bash-completion/build.sh b/packages/bash-completion/build.sh
@@ -1,11 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://github.com/scop/bash-completion
 TERMUX_PKG_DESCRIPTION="Programmable completion for the bash shell"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=2.11
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
+TERMUX_PKG_VERSION=2.12.0
 TERMUX_PKG_SRCURL=https://github.com/scop/bash-completion/releases/download/${TERMUX_PKG_VERSION}/bash-completion-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac
+TERMUX_PKG_SHA256=3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="bash"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true

diff --git a/packages/bash-completion/completions-man.patch b/packages/bash-completion/completions-man.patch
@@ -1,13 +1,24 @@
-diff -uNr bash-completion-2.9/completions/man bash-completion-2.9.mod/completions/man
---- bash-completion-2.9/completions/man	2019-04-27 11:54:49.000000000 +0300
-+++ bash-completion-2.9.mod/completions/man	2019-05-02 15:36:06.454990217 +0300
-@@ -51,8 +51,7 @@
+diff --git a/completions/man b/completions/man
+index b405f084..eaa5b811 100644
+--- a/completions/man
++++ b/completions/man
+@@ -56,18 +56,7 @@ _comp_cmd_man()
          return
      fi
 
 -    local manpath=$(manpath 2>/dev/null || command man -w 2>/dev/null)
--    [[ -z $manpath ]] && manpath="/usr/share/man:/usr/local/share/man"
-+    local manpath="@TERMUX_PREFIX@/share/man"
+-    if [[ ! $manpath ]]; then
+-        # Note: Both "manpath" and "man -w" may be unavailable, in
+-        # which case we determine the man paths based on the
+-        # environment variable MANPATH.
+-        manpath=:${MANPATH-}:
+-        # Note: An empty path (represented by two consecutive colons
+-        # or a preceding/trailing colon) represents the system man
+-        # paths.
+-        manpath=${manpath//::/':/usr/share/man:/usr/local/share/man:'}
+-        manpath=${manpath:1:-1}
+-    fi
++    local manpath="${MANPATH-@TERMUX_PREFIX@/share/man}"
 
      # determine manual section to search
      local sect