scripts: change fallback dir of bash completion

and update docu see #832
ElektraInitiative · Jul 15, 2016 · 1532137 · 1532137
1 parent f8db4df
commit 1532137
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/doc/COMPILE.md b/doc/COMPILE.md
@@ -341,10 +341,15 @@ Currently the installed system files are as following:
 
 |   Module        |         Description             |      Install Path                      |
 |-----------------|---------------------------------|----------------------------------------|
-| bash-completion | bash tab auto completion file   | `BASH_COMPLETION_COMPLETIONSDIR` variable in bash-completions cmake file and pkg-config. Falls back to `/etc/bash_completion.d`.|
+| bash-completion | bash tab auto completion file   | `BASH_COMPLETION_COMPLETIONSDIR` (*)   |
+| zsh-completion  | zsh tab auto completion file    | /usr/share/zsh/vendor-completions      |
 | GIR             | introspection file for bindings | `INTROSPECTION_GIRDIR` from pkg-config |
 | GSettings       | GSettings backend module        | `GIO_MODULE_DIR` from pkg-config       |
 
+
+(*) variable in bash-completions cmake file.
+Without the variable set and pkg-config it will fall back to `/usr/share/bash-completion/completions`.
+
 ## BUILDING ##
 
 ### NO IDE ###

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -32,15 +32,15 @@ if (INSTALL_SYSTEM_FILES)
 			include (LibFindMacros)
 			pkg_get_variable (BASH_COMPLETION_COMPLETIONSDIR bash-completion completionsdir)
 		else ()
-			set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d")
+			set (BASH_COMPLETION_COMPLETIONSDIR "/usr/share/bash-completion/completions")
 		endif ()
 	endif ()
 	install (FILES kdb-bash-completion
 			DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}
 			RENAME kdb)
 	install (FILES kdb_zsh_completion
-			DESTINATION /usr/share/zsh/vendor-completions
-			RENAME _kdb)
+			DESTINATION "/usr/share/zsh/vendor-completions"
+			RENAME "_kdb")
 endif()
 
 configure_file(