system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/meson: use "rename" directive for installing nmcli bash completion

Browse source 
Otherwise, `ninja -C build uninstall` tries to delete "nmcli-completion",
when the file got renamed to "nmcli".

We depend on meson 0.47.2 already.
This commit is contained in:
Thomas Haller 2022-05-13 16:15:13 +02:00
parent d4d001c771
commit 7062de9219
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nmcli/meson.build
View file

@ -2,12 +2,10 @@
if enable_nmcli
# The file is called "nmcli-completion" but should be installed with
# name "nmcli". Currently it gets renamed by "tools/meson-post-install.sh",
# but if we depend on meson 0.46.0, we could use "rename" option.
install_data(
'nmcli-completion',
install_dir: join_paths(nm_datadir, 'bash-completion', 'completions'),
rename: 'nmcli',
)
executable(

5
tools/meson-post-install.sh
View file

@ -14,11 +14,6 @@ install_systemdunitdir="${11}"
[ -n "$DESTDIR" ] && DESTDIR="${DESTDIR%%/}/"
if [ -f "${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli-completion" ]; then
mv "${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli-completion" \
"${DESTDIR}${nm_datadir}/bash-completion/completions/nmcli"
fi
if [ -x "${DESTDIR}${nm_bindir}/nmtui" ]; then
for alias in nmtui-connect nmtui-edit nmtui-hostname; do
ln -sf nmtui "${DESTDIR}${nm_bindir}/$alias"