diff options
| author | EuAndreh <eu@euandre.org> | 2023-03-22 19:31:21 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2023-03-22 22:39:49 -0300 |
| commit | 08997d82b808fcc14f43679f6dcd069a590d642b (patch) | |
| tree | 7b7851e8141449c60c5b51eb54c0b0fde4652816 | |
| parent | src/bin/paku: Explain how to have a file as overlay for Nix (diff) | |
| download | package-repository-08997d82b808fcc14f43679f6dcd069a590d642b.tar.gz package-repository-08997d82b808fcc14f43679f6dcd069a590d642b.tar.xz | |
git mv src/bin/paku src/bin/paku.in
Use the derived version without the ".in" suffix as the executable one,
and remove the explicit "perl src/bin/paku" invocation with a simple
"paku" one.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 15 | ||||
| -rwxr-xr-x | src/bin/paku.in (renamed from src/bin/paku) | 4 |
3 files changed, 11 insertions, 9 deletions
@@ -5,3 +5,4 @@ /.paku/ /debian.mk /public/ +/src/bin/paku @@ -12,7 +12,7 @@ -all: EuAndreh.key guix nix debian homebrew +all: EuAndreh.key guix nix debian homebrew src/bin/paku paku.lock: src/bin/paku Makefile @@ -30,7 +30,7 @@ derived-assets = \ guix: src/org/euandre/packages.scm result-packages result-services src/org/euandre/packages.scm: paku.lock - perl src/bin/paku guix > src/org/euandre/packages.scm + paku guix > src/org/euandre/packages.scm result-packages: guix build -r $@ -v3 -Lsrc/ -K \ @@ -66,14 +66,14 @@ result-services: result-local result-internet nix: default.nix result default.nix: paku.lock - perl src/bin/paku nix > $@ + paku nix > $@ result: nix-build build.nix debian.mk: paku.lock - perl src/bin/paku debian > $@ + paku debian > $@ debian: debian.mk $(MAKE) -f debian.mk @@ -82,7 +82,7 @@ homebrew: Formula Formula: paku.lock mkdir -p $@ - perl src/bin/paku homebrew $@ + paku homebrew $@ touch $@ @@ -92,7 +92,7 @@ public/debian: debian public/paku.html: paku.lock src/bin/paku mkdir -p $(@D) - perl src/bin/paku html > $@ + paku html > $@ public: public/debian public/paku.html @@ -113,7 +113,8 @@ check: all check-ubuntu-deb check-ubuntu-homebrew clean: rm -rf \ - $(derived-assets) result* .paku/ public/ debian.mk + $(derived-assets) result* .paku/ public/ debian.mk \ + src/bin/paku \ EuAndreh.key: paku.lock gpg --armour --export eu@euandre.org > $@ diff --git a/src/bin/paku b/src/bin/paku.in index fcaf1ea..9305ec9 100755 --- a/src/bin/paku +++ b/src/bin/paku.in @@ -438,10 +438,10 @@ sub emit_debian() { \$(DIR)/debian/Packages: \$(debs) - cd \$(\@D) && perl \$\$OLDPWD/src/bin/paku debian-packages *.deb > \$(\@F) + cd \$(\@D) && paku debian-packages *.deb > \$(\@F) \$(DIR)/debian/Release: \$(DIR)/debian/Packages - perl src/bin/paku debian-release \$(DIR)/debian/Packages > \$\@ + paku debian-release \$(DIR)/debian/Packages > \$\@ \$(DIR)/debian/Release.gpg: \$(DIR)/debian/Release gpg -abs -o \$\@ \$(DIR)/debian/Release |