From 369dd18d206945080780f35b502f61b88448bab1 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Sun, 31 Jul 2016 21:10:40 +0200 Subject: Simplify installation of profiles and manpages --- Makefile.in | 211 +++++++----------------------------------------------------- mketc.sh | 20 +----- 2 files changed, 27 insertions(+), 204 deletions(-) diff --git a/Makefile.in b/Makefile.in index 98ecbd252..e47e109d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ -all: apps firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-config.5 +all: apps man MYLIBS = src/lib APPS = src/firejail src/firemon src/firecfg src/libtrace src/libtracelog src/ftee src/faudit +MANPAGES = firejail.1 firemon.1 firecfg.1 firejail-profile.5 firejail-login.5 firejail-config.5 prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -25,27 +26,16 @@ apps: $(APPS) $(APPS): $(MYLIBS) $(MAKE) -C $@ -firemon.1: src/man/firemon.txt - ./mkman.sh $(VERSION) src/man/firemon.txt firemon.1 -firejail.1: src/man/firejail.txt - ./mkman.sh $(VERSION) src/man/firejail.txt firejail.1 -firecfg.1: src/man/firecfg.txt - ./mkman.sh $(VERSION) src/man/firecfg.txt firecfg.1 -firejail-profile.5: src/man/firejail-profile.txt - ./mkman.sh $(VERSION) src/man/firejail-profile.txt firejail-profile.5 -firejail-login.5: src/man/firejail-login.txt - ./mkman.sh $(VERSION) src/man/firejail-login.txt firejail-login.5 -firejail-config.5: src/man/firejail-config.txt - ./mkman.sh $(VERSION) src/man/firejail-config.txt firejail-config.5 +$(MANPAGES): $(wildcard src/man/*.txt) + ./mkman.sh $(VERSION) src/man/$(basename $@).txt $@ + +man: $(MANPAGES) clean: - for dir in $(APPS); do \ - $(MAKE) -C $$dir clean; \ - done - for dir in $(MYLIBS); do \ + for dir in $(APPS) $(MYLIBS); do \ $(MAKE) -C $$dir clean; \ done - rm -f firejail.1 firejail.1.gz firemon.1 firemon.1.gz firecfg.1 firecfg.gz firejail-profile.5 firejail-profile.5.gz firejail-login.5 firejail-login.5.gz firejail-config.5 firejail-config.5.gz firejail*.rpm + rm -f $(MANPAGES) $(MANPAGES:%=%.gz) firejail*.rpm rm -f test/utils/index.html* rm -f test/utils/wget-log rm -f test/utils/lstesting @@ -60,10 +50,7 @@ clean: cd test/dist-compile; ./compile.sh --clean; cd ../.. distclean: clean - for dir in $(APPS); do \ - $(MAKE) -C $$dir distclean; \ - done - for dir in $(MYLIBS); do \ + for dir in $(APPS) $(MYLIBS); do \ $(MAKE) -C $$dir distclean; \ done rm -fr Makefile autom4te.cache config.log config.status config.h uids.h @@ -93,169 +80,23 @@ realinstall: # etc files ./mketc.sh $(sysconfdir) install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail - install -c -m 0644 .etc/0ad.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/Cyberfox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/Mathematica.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/Telegram.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/abrowser.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/atom-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/atom.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/atril.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/audacious.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/audacity.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/aweather.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/bitlbee.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/brave.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/cherrytree.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/chromium-browser.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/chromium.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/clementine.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/cmus.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/conkeror.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/corebird.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/cpio.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/cyberfox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/deadbeef.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/default.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/deluge.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/dillo.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/disable-common.inc $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/disable-devel.inc $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/disable-passwdmgr.inc $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/disable-programs.inc $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/dnscrypt-proxy.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/dnsmasq.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/dropbox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/empathy.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/eom.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/epiphany.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/evince.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/fbreader.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/file.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/filezilla.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/firefox-esr.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/firefox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/flashpeak-slimjet.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/franz.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gitter.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gnome-mplayer.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/google-chrome-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/google-chrome-stable.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/google-chrome-unstable.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/google-chrome.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/google-play-music-desktop-player.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gpredict.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gtar.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gthumb.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gwenview.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/gzip.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/hedgewars.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/hexchat.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/icecat.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/icedove.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/iceweasel.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/jitsi.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/kmail.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/konversation.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/less.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/libreoffice.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/localc.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/lodraw.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/loffice.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/lofromtemplate.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/loimpress.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/lomath.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/loweb.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/lowriter.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/lxterminal.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/mathematica.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/mcabber.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/midori.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/mpv.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/mupen64plus.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/netsurf.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/nolocal.net $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/okular.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/openbox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/opera-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/opera.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/palemoon.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/parole.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/pidgin.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/pix.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/polari.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/psi-plus.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/qbittorrent.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/qtox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/quassel.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/quiterss.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/qutebrowser.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/rhythmbox.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/rtorrent.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/seamonkey-bin.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/seamonkey.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/server.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/skype.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/skypeforlinux.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/snap.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/soffice.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/spotify.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/ssh.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/steam.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/stellarium.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/strings.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/tar.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/telegram.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/thunderbird.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/totem.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/transmission-gtk.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/transmission-qt.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/uget-gtk.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/unbound.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/unrar.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/unzip.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/uudeview.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/vivaldi-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/vivaldi.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/vlc.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/warzone2100.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/webserver.net $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/weechat-curses.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/weechat.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/wesnoth.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/whitelist-common.inc $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/wine.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xchat.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xplayer.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xreader.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xviewer.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xz.profile $(DESTDIR)/$(sysconfdir)/firejail/. - install -c -m 0644 .etc/xzdec.profile $(DESTDIR)/$(sysconfdir)/firejail/. + for file in .etc/* etc/firejail.config; do \ + install -c -m 0644 $$file $(DESTDIR)/$(sysconfdir)/firejail; \ + done sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" - install -c -m 0644 etc/firejail.config $(DESTDIR)/$(sysconfdir)/firejail/. rm -fr .etc # man pages - rm -f firejail.1.gz - gzip -9n firejail.1 - rm -f firemon.1.gz - gzip -9n firemon.1 - rm -f firecfg.1.gz - gzip -9n firecfg.1 - rm -f firejail-profile.5.gz - gzip -9n firejail-profile.5 - rm -f firejail-login.5.gz - gzip -9n firejail-login.5 - rm -f firejail-config.5.gz - gzip -9n firejail-config.5 install -m 0755 -d $(DESTDIR)/$(mandir)/man1 - install -c -m 0644 firejail.1.gz $(DESTDIR)/$(mandir)/man1/. - install -c -m 0644 firemon.1.gz $(DESTDIR)/$(mandir)/man1/. - install -c -m 0644 firecfg.1.gz $(DESTDIR)/$(mandir)/man1/. install -m 0755 -d $(DESTDIR)/$(mandir)/man5 - install -c -m 0644 firejail-profile.5.gz $(DESTDIR)/$(mandir)/man5/. - install -c -m 0644 firejail-login.5.gz $(DESTDIR)/$(mandir)/man5/. - install -c -m 0644 firejail-config.5.gz $(DESTDIR)/$(mandir)/man5/. - rm -f firejail.1.gz firemon.1.gz firecfg.1.gz firejail-profile.5.gz firejail-login.5.gz firejail-config.5.gz + for man in $(MANPAGES); do \ + rm -f $$man.gz; \ + gzip -9n $$man; \ + case "$$man" in \ + *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \ + *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \ + esac; \ + done + rm -f $(MANPAGES) $(MANPAGES:%=%.gz) # bash completion install -m 0755 -d $(DESTDIR)/$(datarootdir)/bash-completion/completions install -c -m 0644 src/bash_completion/firejail.bash_completion $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail @@ -281,12 +122,10 @@ uninstall: rm -f $(DESTDIR)/$(bindir)/firecfg rm -fr $(DESTDIR)/$(libdir)/firejail rm -fr $(DESTDIR)/$(datarootdir)/doc/firejail - rm -f $(DESTDIR)/$(mandir)/man1/firejail.1* - rm -f $(DESTDIR)/$(mandir)/man1/firemon.1* - rm -f $(DESTDIR)/$(mandir)/man1/firecfg.1* - rm -f $(DESTDIR)/$(mandir)/man5/firejail-profile.5* - rm -f $(DESTDIR)/$(mandir)/man5/firejail-login.5* - rm -f $(DESTDIR)/$(mandir)/man5/firejail-config.5* + for man in $(MANPAGES); do \ + rm -f $(DESTDIR)/$(mandir)/man5/$$man*; \ + rm -f $(DESTDIR)/$(mandir)/man1/$$man*; \ + done rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg diff --git a/mketc.sh b/mketc.sh index f44238968..94fad8f10 100755 --- a/mketc.sh +++ b/mketc.sh @@ -2,23 +2,7 @@ rm -fr .etc mkdir .etc -result=$(echo $1 | sed 's/\//\\\//g') -echo $result - -FILES=`ls etc/*.profile` -for file in $FILES -do - sed "s/\/etc\/firejail/$result\/firejail/g" $file > .$file -done - -FILES=`ls etc/*.inc` -for file in $FILES -do - sed "s/\/etc\/firejail/$result\/firejail/g" $file > .$file -done - -FILES=`ls etc/*.net` -for file in $FILES +for file in etc/*.profile etc/*.inc etc/*.net; do - sed "s/\/etc\/firejail/$result\/firejail/g" $file > .$file + sed "s;/etc/firejail;$1/firejail;g" $file > .$file done -- cgit v1.2.3-54-g00ecf