diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | pre-commit.d/20warn-problem-files | 12 |
3 files changed, 25 insertions, 11 deletions
@@ -9,34 +9,42 @@ bindir=${prefix}/bin etcdir=/etc mandir=${prefix}/share/man vardir=/var - +CP=cp -R INSTALL=install -INSTALL_EXE=${INSTALL} -D -INSTALL_DATA=${INSTALL} -m 0644 -D +INSTALL_EXE=${INSTALL} +INSTALL_DATA=${INSTALL} -m 0644 build: etckeeper.spec -./etckeeper-bzr/__init__.py build || echo "** bzr support not built" - + install: mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/ - cp -dR *.d $(DESTDIR)$(etcdir)/etckeeper/ + $(CP) *.d $(DESTDIR)$(etcdir)/etckeeper/ $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf + mkdir -p $(DESTDIR)$(bindir) $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper + mkdir -p $(DESTDIR)$(mandir)/man8 $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 + mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) + mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex $(INSTALL_DATA) cruft_filter $(DESTDIR)$(etcdir)/cruft/filters-unex/etckeeper endif ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2) + mkdir -p $(DESTDIR)$(etcdir)/pacman-g2/hooks $(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper endif ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) + mkdir -p $(DESTDIR)$(prefix)/lib/yum-plugins $(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py + mkdir -p $(DESTDIR)$(etcdir)/yum/pluginconf.d $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf endif ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) + mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit $(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py endif -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" diff --git a/debian/changelog b/debian/changelog index 63fb713..6332a07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +etckeeper (1.12) UNRELEASED; urgency=medium + + * Portability fixes. Thanks, Harald Dunkel. + + -- Joey Hess <joeyh@debian.org> Fri, 09 May 2014 09:23:37 -0300 + etckeeper (1.11) unstable; urgency=low * Fix too broad matching of .gitignored files. diff --git a/pre-commit.d/20warn-problem-files b/pre-commit.d/20warn-problem-files index f7c7580..f28d5ac 100755 --- a/pre-commit.d/20warn-problem-files +++ b/pre-commit.d/20warn-problem-files @@ -6,14 +6,14 @@ exclude_internal () { } if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then - special=$(find . -not -type d -not -type f -not -type l | exclude_internal) || true - hardlinks=$(find . -type f -not -links 1 | exclude_internal ) || true + special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true + hardlinks=$(find . -type f ! -links 1 | exclude_internal ) || true elif [ "$VCS" = hg ]; then - special=$(find . -not -type d -not -type f -not -type l | exclude_internal) || true - hardlinks=$(find . -type f -not -links 1 -exec hg status {} \; | exclude_internal ) || true + special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true + hardlinks=$(find . -type f ! -links 1 -exec hg status {} \; | exclude_internal ) || true elif [ "$VCS" = git ]; then - special=$(find . -not -type d -not -type f -not -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true - hardlinks=$(find . -type f -not -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true + special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true + hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} \; | exclude_internal) || true else special="" fi |