From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 24 Oct 2024 18:49:18 +0000 (+0100)
Subject: meson: factor common strings when handling shell completions
X-Git-Tag: v34~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91aa10affe4c4caa83ea04522456b46658ad5785;p=thirdparty%2Fkmod.git

meson: factor common strings when handling shell completions

Remove some of the repetition, by moving the common roots as needed.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/209
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/meson.build b/meson.build
index 1b862c96..ac4ca41f 100644
--- a/meson.build
+++ b/meson.build
@@ -225,16 +225,16 @@ foreach tuple : _customdirs
 endforeach
 
 _completiondirs = [
-  ['bashcompletiondir', 'bash-completion', 'bash-completion/completions', 'shell-completion/bash/@0@'],
-  ['fishcompletiondir', 'fish',            'fish/vendor_functions.d',     'shell-completion/fish/@0@.fish'],
-  ['zshcompletiondir',  '',                'zsh/site-functions',          'shell-completion/zsh/_@0@'],
+  ['bash', 'bash-completion', 'bash-completion' / 'completions', '@0@'],
+  ['fish', 'fish',            'fish' / 'vendor_functions.d',     '@0@.fish'],
+  ['zsh',  '',                'zsh' / 'site-functions',          '_@0@'],
 ]
 
 foreach tuple : _completiondirs
-  dir_option = tuple[0]
+  dir_option = tuple[0] + 'completiondir'
   pkg_dep = tuple[1]
   def_path = tuple[2]
-  ins_path = tuple[3]
+  ins_name = tuple[3]
 
   completiondir = get_variable(dir_option)
   if completiondir == ''
@@ -264,7 +264,7 @@ foreach tuple : _completiondirs
   if completiondir != 'no'
     foreach comp : _completions
       install_data(
-        files(ins_path.format(comp)),
+        files('shell-completion' / tuple[0] / ins_name.format(comp)),
         install_dir : completiondir,
       )
     endforeach