From 0e59278233adbe00ad5f55d77fe54175d44d7be0 Mon Sep 17 00:00:00 2001 From: Alexey Avramov Date: Sat, 23 May 2020 15:34:51 +0900 Subject: [PATCH] files relocation --- .travis.yml | 4 +- Makefile | 40 +++++++++---------- .../logrotate.d/nohang | 0 .../nohang}/nohang-desktop.conf.in | 0 {nohang => conf/nohang}/nohang.conf.in | 0 {nohang => conf/nohang}/test.conf | 0 FAQ.ru.md => docs/FAQ.ru.md | 0 {nohang => man}/nohang.8 | 0 {tools => man}/oom-sort.1 | 0 {tools => man}/psi-top.1 | 0 {tools => man}/psi2log.1 | 0 {nohang/openrc => openrc}/nohang-desktop.in | 0 {nohang/openrc => openrc}/nohang.in | 0 {nohang => src}/nohang | 0 {tools => src}/oom-sort | 0 {tools => src}/psi-top | 0 {tools => src}/psi2log | 0 {nohang => systemd}/nohang-desktop.service.in | 0 {nohang => systemd}/nohang.service.in | 0 19 files changed, 22 insertions(+), 22 deletions(-) rename nohang/nohang.logrotate => conf/logrotate.d/nohang (100%) rename {nohang => conf/nohang}/nohang-desktop.conf.in (100%) rename {nohang => conf/nohang}/nohang.conf.in (100%) rename {nohang => conf/nohang}/test.conf (100%) rename FAQ.ru.md => docs/FAQ.ru.md (100%) rename {nohang => man}/nohang.8 (100%) rename {tools => man}/oom-sort.1 (100%) rename {tools => man}/psi-top.1 (100%) rename {tools => man}/psi2log.1 (100%) rename {nohang/openrc => openrc}/nohang-desktop.in (100%) rename {nohang/openrc => openrc}/nohang.in (100%) rename {nohang => src}/nohang (100%) rename {tools => src}/oom-sort (100%) rename {tools => src}/psi-top (100%) rename {tools => src}/psi2log (100%) rename {nohang => systemd}/nohang-desktop.service.in (100%) rename {nohang => systemd}/nohang.service.in (100%) diff --git a/.travis.yml b/.travis.yml index fcc6605..00aa768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,13 @@ script: - nohang --check --config /usr/local/etc/nohang/nohang.conf - nohang --check --config /usr/local/etc/nohang/nohang-desktop.conf - - nohang --check --config nohang/test.conf + - nohang --check --config conf/nohang/test.conf - sudo nohang --config /usr/local/etc/nohang/nohang.conf --tasks - sudo nohang --config /usr/local/etc/nohang/nohang-desktop.conf --tasks - /bin/sleep 60 & - - sudo bash -c "nohang -c nohang/test.conf --monitor & tail /dev/zero & sleep 30 && pkill python3" + - sudo bash -c "nohang --monitor --config conf/nohang/test.conf & tail /dev/zero & sleep 30 && pkill python3" - sudo cat /var/log/nohang/nohang.log - sudo make uninstall diff --git a/Makefile b/Makefile index 72a2c38..43cb103 100644 --- a/Makefile +++ b/Makefile @@ -13,24 +13,24 @@ DOCDIR ?= $(DATADIR)/doc/nohang MANDIR ?= $(DATADIR)/man all: - @ echo "Use: make install, install-openrc, make uninstall" + @ echo "Use: make install, make install-openrc, make uninstall" base: install -d $(DESTDIR)$(SBINDIR) - install -m0755 nohang/nohang $(DESTDIR)$(SBINDIR)/nohang + install -m0755 src/nohang $(DESTDIR)$(SBINDIR)/nohang install -d $(DESTDIR)$(BINDIR) - install -m0755 tools/oom-sort $(DESTDIR)$(BINDIR)/oom-sort - install -m0755 tools/psi-top $(DESTDIR)$(BINDIR)/psi-top - install -m0755 tools/psi2log $(DESTDIR)$(BINDIR)/psi2log + install -m0755 src/oom-sort $(DESTDIR)$(BINDIR)/oom-sort + install -m0755 src/psi-top $(DESTDIR)$(BINDIR)/psi-top + install -m0755 src/psi2log $(DESTDIR)$(BINDIR)/psi2log install -d $(DESTDIR)$(SYSCONFDIR)/nohang sed "s|:TARGET_DATADIR:|$(DATADIR)|" \ - nohang/nohang.conf.in > nohang.conf + conf/nohang/nohang.conf.in > nohang.conf sed "s|:TARGET_DATADIR:|$(DATADIR)|" \ - nohang/nohang-desktop.conf.in > nohang-desktop.conf + conf/nohang/nohang-desktop.conf.in > nohang-desktop.conf install -m0644 nohang.conf $(DESTDIR)$(SYSCONFDIR)/nohang/nohang.conf install -m0644 nohang-desktop.conf $(DESTDIR)$(SYSCONFDIR)/nohang/nohang-desktop.conf @@ -47,29 +47,29 @@ base: rm -fv nohang-desktop.conf rm -fv version + install -d $(DESTDIR)$(LOGROTATECONFDIR) + install -m0644 conf/logrotate.d/nohang $(DESTDIR)$(LOGROTATECONFDIR)/nohang + install -d $(DESTDIR)$(MANDIR)/man1 - gzip -c tools/oom-sort.1 > $(DESTDIR)$(MANDIR)/man1/oom-sort.1.gz - gzip -c tools/psi-top.1 > $(DESTDIR)$(MANDIR)/man1/psi-top.1.gz - gzip -c tools/psi2log.1 > $(DESTDIR)$(MANDIR)/man1/psi2log.1.gz + gzip -c man/oom-sort.1 > $(DESTDIR)$(MANDIR)/man1/oom-sort.1.gz + gzip -c man/psi-top.1 > $(DESTDIR)$(MANDIR)/man1/psi-top.1.gz + gzip -c man/psi2log.1 > $(DESTDIR)$(MANDIR)/man1/psi2log.1.gz install -d $(DESTDIR)$(MANDIR)/man8 - gzip -c nohang/nohang.8 > $(DESTDIR)$(MANDIR)/man8/nohang.8.gz + gzip -c man/nohang.8 > $(DESTDIR)$(MANDIR)/man8/nohang.8.gz install -d $(DESTDIR)$(DOCDIR) install -m0644 README.md $(DESTDIR)$(DOCDIR)/README.md install -m0644 CHANGELOG.md $(DESTDIR)$(DOCDIR)/CHANGELOG.md - install -d $(DESTDIR)$(LOGROTATECONFDIR) - install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang - units: install -d $(DESTDIR)$(SYSTEMDUNITDIR) sed "s|:TARGET_SBINDIR:|$(SBINDIR)|; s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|" \ - nohang/nohang.service.in > nohang.service + systemd/nohang.service.in > nohang.service sed "s|:TARGET_SBINDIR:|$(SBINDIR)|; s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|" \ - nohang/nohang-desktop.service.in > nohang-desktop.service + systemd/nohang-desktop.service.in > nohang-desktop.service install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service @@ -92,16 +92,16 @@ openrc: install -d $(DESTDIR)$(SYSCONFDIR)/init.d sed "s|:TARGET_SBINDIR:|$(SBINDIR)|; s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|" \ - nohang/openrc/nohang.in > nohang/openrc/nohang + openrc/nohang.in > openrc/nohang sed "s|:TARGET_SBINDIR:|$(SBINDIR)|; s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|" \ - nohang/openrc/nohang-desktop.in > nohang/openrc/nohang-desktop + openrc/nohang-desktop.in > openrc/nohang-desktop install -m0775 nohang/openrc/nohang $(DESTDIR)$(SYSCONFDIR)/init.d/nohang install -m0775 nohang/openrc/nohang-desktop $(DESTDIR)$(SYSCONFDIR)/init.d/nohang-desktop - rm -fv nohang/openrc/nohang - rm -fv nohang/openrc/nohang-desktop + rm -fv openrc/nohang + rm -fv openrc/nohang-desktop install-openrc: base openrc diff --git a/nohang/nohang.logrotate b/conf/logrotate.d/nohang similarity index 100% rename from nohang/nohang.logrotate rename to conf/logrotate.d/nohang diff --git a/nohang/nohang-desktop.conf.in b/conf/nohang/nohang-desktop.conf.in similarity index 100% rename from nohang/nohang-desktop.conf.in rename to conf/nohang/nohang-desktop.conf.in diff --git a/nohang/nohang.conf.in b/conf/nohang/nohang.conf.in similarity index 100% rename from nohang/nohang.conf.in rename to conf/nohang/nohang.conf.in diff --git a/nohang/test.conf b/conf/nohang/test.conf similarity index 100% rename from nohang/test.conf rename to conf/nohang/test.conf diff --git a/FAQ.ru.md b/docs/FAQ.ru.md similarity index 100% rename from FAQ.ru.md rename to docs/FAQ.ru.md diff --git a/nohang/nohang.8 b/man/nohang.8 similarity index 100% rename from nohang/nohang.8 rename to man/nohang.8 diff --git a/tools/oom-sort.1 b/man/oom-sort.1 similarity index 100% rename from tools/oom-sort.1 rename to man/oom-sort.1 diff --git a/tools/psi-top.1 b/man/psi-top.1 similarity index 100% rename from tools/psi-top.1 rename to man/psi-top.1 diff --git a/tools/psi2log.1 b/man/psi2log.1 similarity index 100% rename from tools/psi2log.1 rename to man/psi2log.1 diff --git a/nohang/openrc/nohang-desktop.in b/openrc/nohang-desktop.in similarity index 100% rename from nohang/openrc/nohang-desktop.in rename to openrc/nohang-desktop.in diff --git a/nohang/openrc/nohang.in b/openrc/nohang.in similarity index 100% rename from nohang/openrc/nohang.in rename to openrc/nohang.in diff --git a/nohang/nohang b/src/nohang similarity index 100% rename from nohang/nohang rename to src/nohang diff --git a/tools/oom-sort b/src/oom-sort similarity index 100% rename from tools/oom-sort rename to src/oom-sort diff --git a/tools/psi-top b/src/psi-top similarity index 100% rename from tools/psi-top rename to src/psi-top diff --git a/tools/psi2log b/src/psi2log similarity index 100% rename from tools/psi2log rename to src/psi2log diff --git a/nohang/nohang-desktop.service.in b/systemd/nohang-desktop.service.in similarity index 100% rename from nohang/nohang-desktop.service.in rename to systemd/nohang-desktop.service.in diff --git a/nohang/nohang.service.in b/systemd/nohang.service.in similarity index 100% rename from nohang/nohang.service.in rename to systemd/nohang.service.in