Merge pull request #1 from theimpossibleastronaut/pr440-reviewed

Pr440 reviewed

completions/README.md

@@ -1,4 +1,12 @@
 # Shell completion scripts
 
-Please refer to each folder about how to install completion for `rmw` to your shell
+By default, rmw completions are installed when rmw is installed (This can be
+disabled by using '-Dinstall_shell_completions' during meson setup). If they
+aren't present on your system, you can install a shell completion manually by
+getting the completion from the rmw source package or git repository. See the
+links below for specific installation instructions for each completion.
 
+
+## Fish
+
+[Where to put completions](https://fishshell.com/docs/current/completions.html#where-to-put-completions)

completions/meson.build

@@ -2,11 +2,11 @@ fish_comp = dependency('fish', required: false)
 
 if get_option('install_shell_completions')
   fish_files = files(
-    'fish/rmw.fish',
+    join_paths('fish', 'rmw.fish'),
   )
 
   # default location
-  fish_install_dir = get_option('datadir') + '/fish/vendor_completions.d'
+  fish_install_dir = join_paths(get_option('datadir'), 'fish', 'vendor_completions.d')
 
   if fish_comp.found()
     # when needed we overload the variable

meson.build

@@ -71,7 +71,10 @@ main_bin = executable(
   )
 
 subdir ('man')
-subdir('completions')
+
+if get_option('install_shell_completions')
+  subdir('completions')
+endif
 
 if get_option('build_tests')
   subdir ('test')