diff options
author | Harald Kubota <harald.kubota@gmail.com> | 2021-01-02 15:32:15 +0900 |
---|---|---|
committer | Harald Kubota <harald.kubota@gmail.com> | 2021-02-12 21:39:44 +0900 |
commit | a37ffc3374e23b8e6318965d84e408acf7a46b73 (patch) | |
tree | 0a0fac6fc98c14ec57ee3fff52ea641d37b72bff /Makefile.in | |
parent | fix #3859 (#3863) (diff) | |
download | firejail-a37ffc3374e23b8e6318965d84e408acf7a46b73.tar.gz firejail-a37ffc3374e23b8e6318965d84e408acf7a46b73.tar.zst firejail-a37ffc3374e23b8e6318965d84e408acf7a46b73.zip |
Add first version of zsh completion
Don't have duplicate descriptions and put = signs where they belong to
zsh completion function now dynamically adjusts for options (e.g. no --apparmor option without AppArmor configured)
No EXTRA_CFLAGS for cpp
Found main.c which does the argument processing. Moved some arguments into the correct #ifdef blocks
Profile selection now much better
Not more cpp. Using preproc.awk instead.
Updated bash firejail command completion to add profiles
ignore bash and zsh dynamically created completion scripts
Moved bash/zsh completions out of ALL_ITEMS to fix make install
Cleanup
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 623c8bd39..8d4dbc430 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -21,12 +21,14 @@ MAN_TARGET = man | |||
21 | MAN_SRC = src/man | 21 | MAN_SRC = src/man |
22 | endif | 22 | endif |
23 | 23 | ||
24 | COMPLETIONDIRS = src/zsh_completion src/bash_completion | ||
24 | all: all_items mydirs $(MAN_TARGET) filters | 25 | all: all_items mydirs $(MAN_TARGET) filters |
25 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats | 26 | APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats |
26 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee | 27 | SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee |
27 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter | 28 | SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter |
28 | MYDIRS = src/lib $(MAN_SRC) | 29 | MYDIRS = src/lib $(MAN_SRC) $(COMPLETIONDIRS) |
29 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so | 30 | MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so |
31 | COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion | ||
30 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 | 32 | MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 |
31 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp | 33 | SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp |
32 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 | 34 | SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 |
@@ -158,6 +160,9 @@ endif | |||
158 | install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail | 160 | install -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firejail |
159 | install -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon | 161 | install -m 0644 src/bash_completion/firemon.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firemon |
160 | install -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg | 162 | install -m 0644 src/bash_completion/firecfg.bash_completion $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg |
163 | # zsh completion | ||
164 | install -m 0755 -d $(DESTDIR)$(datarootdir)/zsh/site-functions | ||
165 | install -m 0644 src/zsh_completion/_firejail $(DESTDIR)$(datarootdir)/zsh/site-functions/ | ||
161 | 166 | ||
162 | install: all | 167 | install: all |
163 | $(MAKE) realinstall | 168 | $(MAKE) realinstall |