Skip to content

Commit

Permalink
debian: Ship all completions
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
  • Loading branch information
stgraber committed Sep 14, 2024
1 parent fb7f189 commit af605bf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,10 @@ jobs:
make doc
cp -R doc/html /opt/incus/doc
mkdir -p /opt/incus/share/bash_completion.d/
/opt/incus/bin/incus completion bash > /opt/incus/share/bash_completion.d/incus
mkdir -p /opt/incus/share/completions/
/opt/incus/bin/incus completion bash > /opt/incus/share/completions/bash
/opt/incus/bin/incus completion fish > /opt/incus/share/completions/fish
/opt/incus/bin/incus completion zsh > /opt/incus/share/completions/zsh
- name: Build UI (canonical)
run: |
Expand Down Expand Up @@ -672,14 +674,20 @@ jobs:
[ "${PKGOS}" = "ubuntu-22.04" ] && CODENAME=jammy
[ "${PKGOS}" = "ubuntu-24.04" ] && CODENAME=noble
mkdir -p pkg/ pkg/lib/systemd/ pkg/opt/ pkg/usr/bin/ pkg/usr/share/bash-completion/completions/
mkdir -p pkg/ pkg/lib/systemd/ pkg/opt/ pkg/usr/bin/ \
pkg/usr/share/bash-completion/completions/ \
pkg/usr/share/fish/vendor_completions.d/ \
pkg/usr/share/zsh/vendor-completions/
cp -R debian pkg/debian
cp bin/* pkg/usr/bin/
cp -R /opt/incus pkg/opt/
cp -R etc pkg/etc
mv pkg/opt/incus/lib/systemd/system pkg/lib/systemd/system
ln -s /opt/incus/share/bash_completion.d/incus pkg/usr/share/bash-completion/completions/incus
ln -s /opt/incus/share/completions/bash pkg/usr/share/bash-completion/completions/incus
ln -s /opt/incus/share/completions/fish pkg/usr/share/fish/vendor_completions.d/incus.fish
ln -s /opt/incus/share/completions/zsh pkg/usr/share/zsh/vendor-completions/_incus
ln -s /opt/incus/bin/lxd-to-incus pkg/usr/bin/lxd-to-incus
Expand Down
4 changes: 3 additions & 1 deletion debian/incus-client.install
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
usr/bin/incus
usr/share/bash-completion
usr/share/fish
usr/share/locale
usr/share/zsh
opt/incus/bin/incus
opt/incus/share/bash_completion.d
opt/incus/share/completions
opt/incus/share/locale
4 changes: 3 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ override_dh_install:
# Handle incus-client
rm debian/incus-base/usr/bin/incus
rm debian/incus-base/opt/incus/bin/incus
rm -R debian/incus-base/opt/incus/share/bash_completion.d
rm -R debian/incus-base/opt/incus/share/completions
rm -R debian/incus-base/opt/incus/share/locale
rm -R debian/incus-base/usr/share/bash-completion
rm -R debian/incus-base/usr/share/fish
rm -R debian/incus-base/usr/share/locale
rm -R debian/incus-base/usr/share/zsh

# Handle incus-extra
rm debian/incus-base/usr/bin/fuidshift
Expand Down

0 comments on commit af605bf

Please sign in to comment.