aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorLibravatar Harald Kubota <harald.kubota@gmail.com>2021-01-02 15:32:15 +0900
committerLibravatar Harald Kubota <harald.kubota@gmail.com>2021-02-12 21:39:44 +0900
commita37ffc3374e23b8e6318965d84e408acf7a46b73 (patch)
tree0a0fac6fc98c14ec57ee3fff52ea641d37b72bff /Makefile.in
parentfix #3859 (#3863) (diff)
downloadfirejail-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.in7
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
21MAN_SRC = src/man 21MAN_SRC = src/man
22endif 22endif
23 23
24COMPLETIONDIRS = src/zsh_completion src/bash_completion
24all: all_items mydirs $(MAN_TARGET) filters 25all: all_items mydirs $(MAN_TARGET) filters
25APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats 26APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats
26SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee 27SBOX_APPS = src/faudit/faudit src/fbuilder/fbuilder src/ftee/ftee
27SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter 28SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter
28MYDIRS = src/lib $(MAN_SRC) 29MYDIRS = src/lib $(MAN_SRC) $(COMPLETIONDIRS)
29MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so 30MYLIBS = src/libpostexecseccomp/libpostexecseccomp.so src/libtrace/libtrace.so src/libtracelog/libtracelog.so
31COMPLETIONS = src/zsh_completion/_firejail src/bash_completion/firejail.bash_completion
30MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5 32MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-users.5
31SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp 33SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp
32SECCOMP_FILTERS = seccomp seccomp.debug seccomp.32 seccomp.block_secondary seccomp.mdwx seccomp.mdwx.32 34SECCOMP_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
162install: all 167install: all
163 $(MAKE) realinstall 168 $(MAKE) realinstall