FbIN/hblock
1
0
Fork 0
mirror of https://github.com/hectorm/hblock.git synced 2026-04-18 13:06:34 +05:30
Code Issues Projects Releases Packages Wiki Activity

Improved package creation

Browse source
This commit is contained in:
Héctor Molinero Fernández 2020-10-18 16:22:25 +02:00
commit 6f4b12f8e5
8 changed files with 31 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,5 +1,4 @@
/debian/
/dist/ /dist/
/rpmbuild/
node_modules/ node_modules/
npm-debug.log* npm-debug.log*

2
.gitlab-ci.yml
View file

@ -155,7 +155,7 @@ package:deb:
- cat /etc/os-release - cat /etc/os-release
- > - >
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends
build-essential debhelper dh-systemd build-essential debhelper dh-systemd dpkg-dev make
script: script:
- if [ -d ./resources/deb/ ]; then make DISTDIR=./dist/package-deb/ package-deb; fi - if [ -d ./resources/deb/ ]; then make DISTDIR=./dist/package-deb/ package-deb; fi
artifacts: artifacts:

50
Makefile
View file

@ -12,9 +12,9 @@ SYSTEMDUNITDIR := $(LIBDIR)/systemd/system
SHELLCHECK := $(shell command -v shellcheck 2>/dev/null) SHELLCHECK := $(shell command -v shellcheck 2>/dev/null)
SYSTEMCTL := $(shell command -v systemctl 2>/dev/null) SYSTEMCTL := $(shell command -v systemctl 2>/dev/null)
DISTDIR := ./dist DISTDIR := $(CURDIR)/dist
RESOURCESDIR := ./resources RESOURCESDIR := $(CURDIR)/resources
HBLOCK := ./hblock HBLOCK := $(CURDIR)/hblock
HBLOCK_VERSION := $(shell '$(RESOURCESDIR)'/version.sh get) HBLOCK_VERSION := $(shell '$(RESOURCESDIR)'/version.sh get)
HOSTS := $(DISTDIR)/hosts HOSTS := $(DISTDIR)/hosts
@ -173,29 +173,27 @@ uninstall:
package-deb: $(DEB_PACKAGE) package-deb: $(DEB_PACKAGE)
$(DEB_PACKAGE): $(DEB_PACKAGE): | $(DISTDIR)
rm -rf ./debian/ rm -rf '$(DISTDIR)'/debian/
cp -r '$(RESOURCESDIR)'/deb/ ./debian/ cp -r '$(RESOURCESDIR)'/deb/ '$(DISTDIR)'/debian/
sed -i 's|__PKG_VERSION__|$(HBLOCK_VERSION)|g' ./debian/changelog cp -r '$(RESOURCESDIR)'/systemd/hblock.service '$(DISTDIR)'/debian/
sed -i "s|__PKG_DATE__|$$(LANG=C date -R)|g" ./debian/changelog cp -r '$(RESOURCESDIR)'/systemd/hblock.timer '$(DISTDIR)'/debian/
dpkg-buildpackage -us -uc sed -i 's|__PKG_VERSION__|$(HBLOCK_VERSION)|g' '$(DISTDIR)'/debian/changelog
mkdir -p "$$(dirname '$@')" sed -i "s|__PKG_DATE__|$$(LC_ALL=C date -Ru)|g" '$(DISTDIR)'/debian/changelog
mv ../hblock_'$(HBLOCK_VERSION)'_all.deb '$@' cd '$(DISTDIR)' && dpkg-buildpackage -us -uc
rm -f ../hblock_'$(HBLOCK_VERSION)'.dsc ../hblock_'$(HBLOCK_VERSION)'.tar.gz mv -f '$(DISTDIR)'/../hblock_'$(HBLOCK_VERSION)'_all.deb '$@'
rm -f ../hblock_'$(HBLOCK_VERSION)'_*.buildinfo ../hblock_'$(HBLOCK_VERSION)'_*.changes rm -f '$(DISTDIR)'/../hblock_'$(HBLOCK_VERSION)'.dsc '$(DISTDIR)'/../hblock_'$(HBLOCK_VERSION)'.tar.gz
rm -rf ./debian/ rm -f '$(DISTDIR)'/../hblock_'$(HBLOCK_VERSION)'_*.buildinfo '$(DISTDIR)'/../hblock_'$(HBLOCK_VERSION)'_*.changes
package-rpm: $(RPM_PACKAGE) package-rpm: $(RPM_PACKAGE)
$(RPM_PACKAGE): $(RPM_PACKAGE): | $(DISTDIR)
rm -rf ./rpmbuild/ rm -rf '$(DISTDIR)'/rpmbuild/
cp -r '$(RESOURCESDIR)'/rpm/ ./rpmbuild/ cp -r '$(RESOURCESDIR)'/rpm/ '$(DISTDIR)'/rpmbuild/
sed -i 's|__PKG_VERSION__|$(HBLOCK_VERSION)|g' ./rpmbuild/SPECS/hblock.spec sed -i 's|__PKG_VERSION__|$(HBLOCK_VERSION)|g' '$(DISTDIR)'/rpmbuild/SPECS/hblock.spec
tar -czf ./rpmbuild/SOURCES/hblock-'$(HBLOCK_VERSION)'.tar.gz --exclude=./rpmbuild --exclude=./.git ./ tar -czf '$(DISTDIR)'/rpmbuild/SOURCES/hblock-'$(HBLOCK_VERSION)'.tar.gz --exclude-vcs --exclude='$(DISTDIR)' '$(CURDIR)'
rpmbuild -D "_topdir $$(pwd)/rpmbuild" -bb ./rpmbuild/SPECS/hblock.spec rpmbuild -D "_topdir $$(readlink -f '$(DISTDIR)'/rpmbuild/)" -bb '$(DISTDIR)'/rpmbuild/SPECS/hblock.spec
mkdir -p "$$(dirname '$@')" mv -f '$(DISTDIR)'/rpmbuild/RPMS/noarch/hblock-'$(HBLOCK_VERSION)'-*.noarch.rpm '$@'
mv ./rpmbuild/RPMS/noarch/hblock-'$(HBLOCK_VERSION)'-*.noarch.rpm '$@'
rm -rf ./rpmbuild/
################################################## ##################################################
## "clean" target ## "clean" target
@ -203,8 +201,6 @@ $(RPM_PACKAGE):
.PHONY: clean .PHONY: clean
clean: clean:
rm -f $(addprefix ', $(addsuffix ', \ rm -f $(addprefix ', $(addsuffix ', $(HOSTS) $(HOSTS_ALT_FORMATS) $(HOSTS_STATS) $(HOSTS_INDEX) $(DEB_PACKAGE) $(RPM_PACKAGE)))
$(HOSTS) $(HOSTS_ALT_FORMATS) $(HOSTS_STATS) $(HOSTS_INDEX) \ rm -rf $(addprefix ', $(addsuffix ', $(DISTDIR)/debian/ $(DISTDIR)/rpmbuild/))
$(DEB_PACKAGE) $(RPM_PACKAGE) \
))
if [ -d '$(DISTDIR)' ] && [ -z "$$(ls -A '$(DISTDIR)')" ]; then rmdir '$(DISTDIR)'; fi if [ -d '$(DISTDIR)' ] && [ -z "$$(ls -A '$(DISTDIR)')" ]; then rmdir '$(DISTDIR)'; fi

6
resources/deb/control
View file

@ -2,13 +2,15 @@ Source: hblock
Section: utils Section: utils
Priority: optional Priority: optional
Maintainer: Héctor Molinero Fernández <hector@molinero.dev> Maintainer: Héctor Molinero Fernández <hector@molinero.dev>
Build-Depends: debhelper (>=9), dh-systemd (>=1.5), make (>=4) Build-Depends: debhelper (>=9), dh-systemd (>=1.5)
Standards-Version: 4.0.0 Standards-Version: 4.0.0
Homepage: https://github.com/hectorm/hblock Homepage: https://github.com/hectorm/hblock
Vcs-Browser: https://github.com/hectorm/hblock
Vcs-Git: https://github.com/hectorm/hblock.git
Package: hblock Package: hblock
Architecture: all Architecture: all
Depends: curl, ${misc:Depends} Depends: curl | wget, ${misc:Depends}
Description: Improve your security and privacy by blocking ads, tracking and malware domains Description: Improve your security and privacy by blocking ads, tracking and malware domains
This POSIX-compliant shell script, designed for Unix-like systems, gets a list This POSIX-compliant shell script, designed for Unix-like systems, gets a list
of domains that serve ads, tracking scripts and malware from multiple sources of domains that serve ads, tracking scripts and malware from multiple sources

1
resources/deb/hblock.dirs
View file

@ -1 +0,0 @@
usr/bin

1
resources/deb/install Normal file
View file

@ -0,0 +1 @@
../hblock /usr/bin

10
resources/deb/rules
View file

@ -2,13 +2,3 @@
%: %:
dh $@ --with=systemd dh $@ --with=systemd
override_dh_auto_build:
cp -f "$$(pwd)/resources/systemd/hblock.timer" "$$(pwd)/debian/"
cp -f "$$(pwd)/resources/systemd/hblock.service" "$$(pwd)/debian/"
override_dh_auto_install:
'$(MAKE)' DESTDIR="$$(pwd)/debian/hblock" PREFIX="$$(pwd)/debian/hblock/usr" SKIP_INSTALL_SERVICE=1 install
override_dh_installinit:
true

1
resources/deb/source/format Normal file
View file

@ -0,0 +1 @@
3.0 (native)