From d77d944b27c1fc6648cc8eb415be9b4b3b37dbea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 13 Aug 2020 13:01:21 +0800 Subject: [PATCH] cblrpm bash completion --- bash_completion | 14 ++++++++++++++ cabal-rpm.spec | 10 ++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 bash_completion diff --git a/bash_completion b/bash_completion new file mode 100644 index 0000000..df66beb --- /dev/null +++ b/bash_completion @@ -0,0 +1,14 @@ +_cabal-rpm() +{ + local CMDLINE + local IFS=$'\n' + CMDLINE=(--bash-completion-index $COMP_CWORD) + + for arg in ${COMP_WORDS[@]}; do + CMDLINE=(${CMDLINE[@]} --bash-completion-word $arg) + done + + COMPREPLY=( $(cabal-rpm "${CMDLINE[@]}") ) +} + +complete -o filenames -F _cabal-rpm cabal-rpm cblrpm diff --git a/cabal-rpm.spec b/cabal-rpm.spec index f996589..380da39 100644 --- a/cabal-rpm.spec +++ b/cabal-rpm.spec @@ -5,7 +5,7 @@ Name: cabal-rpm Version: 2.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM packaging tool for Haskell Cabal-based packages License: GPLv3+ @@ -14,6 +14,7 @@ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz # End cabal-rpm sources Source1: cblrpm.1 +Source2: bash_completion # Begin cabal-rpm deps: BuildRequires: ghc-rpm-macros @@ -86,7 +87,8 @@ pandoc -s -t man man/cabal-rpm.1.md > man/cabal-rpm.1 # End cabal-rpm install mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ -dist/build/%{name}/%{name} --bash-completion-script %{name} > %{buildroot}%{_datadir}/bash-completion/completions/%{name} +install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_datadir}/bash-completion/completions/%{name} +ln -s %{name} %{buildroot}%{_datadir}/bash-completion/completions/cblrpm %if %{with manpage} install -p -m 0644 -D man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 @@ -104,11 +106,15 @@ ln -s %{name} %{buildroot}%{_bindir}/cblrpm # End cabal-rpm files %{_datadir}/bash-completion/completions/%{name} %{_bindir}/cblrpm +%{_datadir}/bash-completion/completions/cblrpm %{_mandir}/man1/%{name}.1* %{_mandir}/man1/cblrpm.1* %changelog +* Thu Aug 13 2020 Jens Petersen - 2.0.6-4 +- also bash completion for cblrpm alias + * Mon Aug 10 2020 Jens Petersen - 2.0.6-3 - setup bash completion