Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

Install bash/zsh completions in correct locations

Browse Source
This commit is contained in:
Oliver Giles 2018-10-16 20:20:43 +03:00
parent fab5cef0ca
commit fda11a652b
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -99,6 +99,10 @@ if(BUILD_TESTS)
endif() endif()
set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files") set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
install(TARGETS laminard laminarc RUNTIME DESTINATION usr/bin) install(TARGETS laminard laminarc RUNTIME DESTINATION usr/bin)
install(FILES laminar.service DESTINATION ${SYSTEMD_UNITDIR}) install(FILES laminar.service DESTINATION ${SYSTEMD_UNITDIR})
install(FILES laminar.conf DESTINATION etc) install(FILES laminar.conf DESTINATION etc)
install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc)
install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc)

2
docker-build-centos.sh
View File

@ -66,6 +66,8 @@ make
%{_bindir}/laminard %{_bindir}/laminard
%{_unitdir}/laminar.service %{_unitdir}/laminar.service
%config(noreplace) %{_sysconfdir}/laminar.conf %config(noreplace) %{_sysconfdir}/laminar.conf
%{_datarootdir}/bash-completion/completions/laminarc
%{_datarootdir}/zsh/site-functions/_laminarc
%post %post
echo Creating laminar user with home in %{_sharedstatedir}/laminar echo Creating laminar user with home in %{_sharedstatedir}/laminar

2
docker-build-debian.sh
View File

@ -37,7 +37,7 @@ cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
make install make install
cd /build cd /build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ /laminar cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
make -j4 make -j4
mkdir laminar mkdir laminar
make DESTDIR=laminar install/strip make DESTDIR=laminar install/strip

0
laminarc-completion.bash → etc/laminarc-completion.bash
View File

0
laminarc-completion.zsh → etc/laminarc-completion.zsh
View File