From e45e5efe65660037a784055a53d243a9a0dca017 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Tue, 28 Mar 2023 12:14:17 -0300 Subject: src/bin/paku.in, Makefile: Use "debian.out.txt" to communicate output files --- .gitignore | 1 + Makefile | 6 +++--- src/bin/paku.in | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 922b93a..adc299e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /result* /*.mk /*.sentinel +/*.out.txt /tests/internet/etc/postfix/main.cf /tests/internet/etc/dkimproxyout.conf /tests/internet/etc/dovecot/dovecot.conf diff --git a/Makefile b/Makefile index 74607bb..ef7ae7b 100644 --- a/Makefile +++ b/Makefile @@ -94,8 +94,8 @@ Formula: paku.lock public/debian: debian.sentinel - mkdir -p $(@D) - rsync -avP --delete `$(MAKE) -sf debian.mk public-dir`/ $@/ + mkdir -p $@ + cp -R `cat debian.out.txt` $@ touch $@ public/paku.html: paku.lock @@ -111,7 +111,7 @@ upload: public clean: src/bin/paku rm -rf "`paku -C datadir`" rm -rf \ - $(derived-assets) result* *.mk *.sentinel + $(derived-assets) result* *.mk *.sentinel *.out.txt check-shellcheck: diff --git a/src/bin/paku.in b/src/bin/paku.in index a4dff73..3b2d221 100755 --- a/src/bin/paku.in +++ b/src/bin/paku.in @@ -471,10 +471,12 @@ sub emit_debian() { GPGKEY = '$json->{maintainer}{name} <$json->{maintainer}{email}>' - all: \$(DIR)/debian/InRelease \$(DIR)/debian/Release.gpg \$(DIR)/debian/public-key.asc + all: \\ + \$(DIR)/debian/InRelease \$(DIR)/debian/Release.gpg \\ + \$(DIR)/debian/public-key.asc debian.out.txt - public-dir: - \@printf '\$(DIR)/debian' + debian.out.txt: + \@printf '\$(DIR)/debian/\\n' > \$\@ \$(DIR)/debian/Packages: \$(debs) -- cgit v1.2.3