diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-07 11:11:25 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-09-07 11:17:50 +0200 |
| commit | c452ffcc6e625340621bec6c03d334cb64ee80ad (patch) | |
| tree | 140df17ce2f03b08685e21cf9070be1b2c75709d | |
| parent | 3601f846b075bc086e2c64716601c5325cdc3fca (diff) | |
build: Rename qmicli completion file
The qmimcli `bash-completion` file has the `-completion` suffix as
it can be overriden by the generated qmimcli binary file. However,
meson builds the binary field in a different build directory so there
is no need to have it renamed.
| -rw-r--r-- | meson.build | 1 | ||||
| -rwxr-xr-x | meson_post_install.py | 7 | ||||
| -rw-r--r-- | src/qmicli/meson.build | 2 | ||||
| -rw-r--r-- | src/qmicli/qmicli (renamed from src/qmicli/qmicli-completion) | 0 |
4 files changed, 1 insertions, 9 deletions
diff --git a/meson.build b/meson.build index d28e560..49fcea0 100644 --- a/meson.build +++ b/meson.build @@ -252,7 +252,6 @@ configure_file( meson.add_install_script( 'meson_post_install.py', get_option('bindir'), - enable_bash_completion ? bash_completion_completionsdir : '', ) output = '\n' + meson.project_name() + ' ' + meson.project_version() + '\n\n' diff --git a/meson_post_install.py b/meson_post_install.py index 245fb6a..bf77991 100755 --- a/meson_post_install.py +++ b/meson_post_install.py @@ -11,10 +11,3 @@ prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] bindir = os.path.join(prefix, sys.argv[1]) subprocess.check_call(['chmod', '755', os.path.join(bindir, 'qmi-network')]) - -bash_completion_completionsdir = sys.argv[2] -if bash_completion_completionsdir: - if not os.path.isabs(bash_completion_completionsdir): - bash_completion_completionsdir = os.path.join(prefix, bash_completion_completionsdir) - os.rename(os.path.join(bash_completion_completionsdir, 'qmicli-completion'), - os.path.join(bash_completion_completionsdir, 'qmicli')) diff --git a/src/qmicli/meson.build b/src/qmicli/meson.build index c2db52d..c1d80b2 100644 --- a/src/qmicli/meson.build +++ b/src/qmicli/meson.build @@ -51,7 +51,7 @@ qmicli = executable( if enable_bash_completion install_data( - 'qmicli-completion', + 'qmicli', install_dir: bash_completion_completionsdir, ) endif diff --git a/src/qmicli/qmicli-completion b/src/qmicli/qmicli index fa75668..fa75668 100644 --- a/src/qmicli/qmicli-completion +++ b/src/qmicli/qmicli |