github/nohang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sed instead of envsubst

Browse Source
This commit is contained in:
Alexey Avramov 2020-05-06 01:29:08 +09:00
parent 784ddfdb68
commit b3978a083a
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -1,7 +1,7 @@
DESTDIR ?= DESTDIR ?=
PREFIX ?= /usr/local PREFIX ?= /usr/local
SYSCONFDIR ?= /usr/local/etc SYSCONFDIR ?= /usr/local/etc
SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system SYSTEMDUNITDIR ?= /usr/local/lib/systemd/system
LOGDIR ?= /var/log LOGDIR ?= /var/log
LOGROTATECONFDIR ?= /etc/logrotate.d LOGROTATECONFDIR ?= /etc/logrotate.d
@ -31,7 +31,6 @@ install:
install -d $(DESTDIR)$(DATADIR)/nohang install -d $(DESTDIR)$(DATADIR)/nohang
install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf
install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf
-git describe --tags --long --dirty > version -git describe --tags --long --dirty > version
-install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version -install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version
-rm -fv version -rm -fv version
@ -50,8 +49,8 @@ install:
install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang
-install -d $(DESTDIR)$(SYSTEMDUNITDIR) -install -d $(DESTDIR)$(SYSTEMDUNITDIR)
env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang.service.in > nohang.service -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang.service.in > nohang.service
env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang-desktop.service.in > nohang-desktop.service -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang-desktop.service.in > nohang-desktop.service
-install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
-install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service -install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service
-rm -fv nohang.service -rm -fv nohang.service
@ -77,7 +76,6 @@ build_deb:
install -d $(DESTDIR)$(DATADIR)/nohang install -d $(DESTDIR)$(DATADIR)/nohang
install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf install -m0644 nohang/nohang.conf $(DESTDIR)$(DATADIR)/nohang/nohang.conf
install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf install -m0644 nohang/nohang-desktop.conf $(DESTDIR)$(DATADIR)/nohang/nohang-desktop.conf
-git describe --tags --long --dirty > version -git describe --tags --long --dirty > version
-install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version -install -m0644 version $(DESTDIR)$(DATADIR)/nohang/version
-rm -fv version -rm -fv version
@ -96,8 +94,8 @@ build_deb:
install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang install -m0644 nohang/nohang.logrotate $(DESTDIR)$(LOGROTATECONFDIR)/nohang
-install -d $(DESTDIR)$(SYSTEMDUNITDIR) -install -d $(DESTDIR)$(SYSTEMDUNITDIR)
env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang.service.in > nohang.service -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang.service.in > nohang.service
env BINDIR=$(BINDIR) SYSCONFDIR=$(SYSCONFDIR) envsubst < nohang/nohang-desktop.service.in > nohang-desktop.service -sed "s|:TARGET_SBINDIR:|$(SBINDIR)|g;s|:TARGET_SYSCONFDIR:|$(SYSCONFDIR)|g" nohang/nohang-desktop.service.in > nohang-desktop.service
-install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service -install -m0644 nohang.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang.service
-install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service -install -m0644 nohang-desktop.service $(DESTDIR)$(SYSTEMDUNITDIR)/nohang-desktop.service
-rm -fv nohang.service -rm -fv nohang.service

2
README.md
View File

@ -126,7 +126,7 @@ $ sudo systemctl enable --now nohang-desktop
Install build dependencies: Install build dependencies:
```bash ```bash
$ sudo apt install make fakeroot gettext $ sudo apt install make fakeroot
``` ```
Clone latest git snapshot and run build script to build deb package: Clone latest git snapshot and run build script to build deb package:

2
nohang/nohang-desktop.service.in
View File

@ -5,7 +5,7 @@ Conflicts=nohang.service
After=system.slice After=system.slice
[Service] [Service]
ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang-desktop.conf --monitor ExecStart=:TARGET_SBINDIR:/nohang --monitor --config :TARGET_SYSCONFDIR:/nohang/nohang-desktop.conf
SyslogIdentifier=nohang-desktop SyslogIdentifier=nohang-desktop
KillMode=mixed KillMode=mixed
Restart=always Restart=always

2
nohang/nohang.service.in
View File

@ -5,7 +5,7 @@ Conflicts=nohang-desktop.service
After=system.slice After=system.slice
[Service] [Service]
ExecStart=${BINDIR}/nohang --config ${CONFDIR}/nohang/nohang.conf --monitor ExecStart=:TARGET_SBINDIR:/nohang --monitor --config :TARGET_SYSCONFDIR:/nohang/nohang.conf
SyslogIdentifier=nohang SyslogIdentifier=nohang
KillMode=mixed KillMode=mixed
Restart=always Restart=always