Merge branch 'pkgs-bash-completion' into 'master'

AntonVanAssche · Apr 22, 2024 · 69a71f1 · 69a71f1
2 parents 377017e + 204e4e5
commit 69a71f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/pkgs.yml b/.github/workflows/pkgs.yml
@@ -25,9 +25,11 @@ jobs:
 
           /usr/bin/mkdir -pv bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/usr/bin
           /usr/bin/mkdir -pv bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/usr/share/man/man1
+          /usr/bin/mkdir -pv bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/usr/share/bash-completion/completions
 
           /usr/bin/cp -rv bashpass-${{ env.RELEASE_VERSION }}/bashpass bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/usr/bin/
           /usr/bin/cp -rv bashpass-${{ env.RELEASE_VERSION }}/docs/man/bashpass{,.conf}.1.gz bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/usr/share/man/man1/
+          /usr/bin/cp -rv bashpass-${{ env.RELEASE_VERSION }}/scripts/bashpass-completion.sh bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb//usr/share/bash-completion/completions/bashpass
 
           /usr/bin/dpkg-deb --build bashpass-${{ env.RELEASE_VERSION }}/pkgs/deb/ "bashpass_${{ env.RELEASE_VERSION }}_all.deb"
 

diff --git a/pkgs/rpm/bashpass.spec b/pkgs/rpm/bashpass.spec
@@ -23,15 +23,18 @@ rm -rf %{buildroot}
 
 %{__mkdir_p} %{buildroot}%{_bindir}
 %{__mkdir_p} %{buildroot}%{_mandir}/man1
+%{__mkdir_p} %{buildroot}%{_datadir}/bash-completion/completions
 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}/%{name}
 %{__install} -m 0644 docs/man/%{name}.1.gz %{buildroot}%{_mandir}/man1/%{name}.1.gz
 %{__install} -m 0644 docs/man/%{name}.conf.1.gz %{buildroot}%{_mandir}/man1/%{name}.conf.1.gz
+%{__install} -m 0644 scripts/%{name}-completion.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %{_bindir}/%{name}
+%{_datadir}/bash-completion/completions/%{name}
 
 %doc
 %{_mandir}/man1/%{name}.1.gz