From 6cc8f33009431ddc4bca55c6787fe1dc73e7aa5d Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 4 Apr 2026 10:07:25 +0200 Subject: [PATCH] add keyword script --- Makefile | 35 ++++++++++++++++++----------------- src/addkeywords | 27 +++++++++++++++++++++++++++ src/addocr | 4 ++-- src/scantopdf | 0 src/scantopdfbw | 0 src/scantopdfgray | 0 6 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 src/addkeywords mode change 100755 => 100644 src/scantopdf mode change 100755 => 100644 src/scantopdfbw mode change 100755 => 100644 src/scantopdfgray diff --git a/Makefile b/Makefile index 7462f7f..bb09b07 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,7 @@ SHAREDIR = usr/local/share all: test package -test: $(BUILDDIR)/parts/scanbasic.sh \ - $(SRCDIR)/errlog.sh \ - $(SRCDIR)/addocr.sh +test: $(BUILDDIR)/parts/scanbasic.sh ./tests/addocr.bats ./tests/scanbasic.bats @@ -26,7 +24,8 @@ test: $(BUILDDIR)/parts/scanbasic.sh \ build: $(PACKAGEDIR)/$(BINDIR)/scantopdf \ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray \ $(PACKAGEDIR)/$(BINDIR)/scantopdfbw \ - $(PACKAGEDIR)/$(BINDIR)/addocr + $(PACKAGEDIR)/$(BINDIR)/addocr \ + $(PACKAGEDIR)/$(BINDIR)/addkeywords package: $(BUILDDIR)/$(PACKAGENAME).deb @@ -48,8 +47,7 @@ $(BUILDDIR)/parts/scanbasic.sh: \ ################################################################################ $(PACKAGEDIR)/$(BINDIR)/scantopdf: \ - $(BUILDDIR)/parts/scanbasic.sh \ - $(SRCDIR)/scantopdf + $(BUILDDIR)/parts/scanbasic.sh mkdir -p $(@D) ./tools/includer $(SRCDIR)/scantopdf \ @@ -58,8 +56,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdf: \ chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdf $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \ - $(BUILDDIR)/parts/scanbasic.sh \ - $(SRCDIR)/scantopdfgray + $(BUILDDIR)/parts/scanbasic.sh mkdir -p $(@D) ./tools/includer $(SRCDIR)/scantopdfgray \ @@ -68,8 +65,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray: \ chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfgray $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \ - $(BUILDDIR)/parts/scanbasic.sh \ - $(SRCDIR)/scantopdfbw + $(BUILDDIR)/parts/scanbasic.sh mkdir -p $(@D) ./tools/includer $(SRCDIR)/scantopdfgray \ @@ -77,9 +73,7 @@ $(PACKAGEDIR)/$(BINDIR)/scantopdfbw: \ > $(PACKAGEDIR)/$(BINDIR)/scantopdfbw chmod 755 $(PACKAGEDIR)/$(BINDIR)/scantopdfbw -$(PACKAGEDIR)/$(BINDIR)/addocr: \ - $(SRCDIR)/errlog.sh \ - $(SRCDIR)/addocr.sh +$(PACKAGEDIR)/$(BINDIR)/addocr: mkdir -p $(@D) ./tools/includer $(SRCDIR)/addocr \ @@ -87,18 +81,24 @@ $(PACKAGEDIR)/$(BINDIR)/addocr: \ > $(PACKAGEDIR)/$(BINDIR)/addocr chmod 755 $(PACKAGEDIR)/$(BINDIR)/addocr +$(PACKAGEDIR)/$(BINDIR)/addkeywords: + + mkdir -p $(@D) + ./tools/includer $(SRCDIR)/keywords \ + | sed "s/@VERSION@/$(VERSION)/" \ + > $(PACKAGEDIR)/$(BINDIR)/addkeywords + chmod 755 $(PACKAGEDIR)/$(BINDIR)/addkeywords + ################################################################################ -$(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html: \ - $(SRCDIR)/cutpage.html +$(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html: mkdir -p $(@D) cp $(SRCDIR)/cutpage.html $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html ################################################################################ -$(PACKAGEDIR)/DEBIAN/control: \ - $(SRCDIR)/control +$(PACKAGEDIR)/DEBIAN/control: mkdir -p $(@D) cat $(SRCDIR)/control \ @@ -110,6 +110,7 @@ $(BUILDDIR)/$(PACKAGENAME).deb: \ $(PACKAGEDIR)/$(BINDIR)/scantopdfgray \ $(PACKAGEDIR)/$(BINDIR)/scantopdfbw \ $(PACKAGEDIR)/$(BINDIR)/addocr \ + $(PACKAGEDIR)/$(BINDIR)/addkeywords \ $(PACKAGEDIR)/$(SHAREDIR)/scantopdf/cutpage.html \ $(PACKAGEDIR)/DEBIAN/control diff --git a/src/addkeywords b/src/addkeywords new file mode 100644 index 0000000..4e6cb5b --- /dev/null +++ b/src/addkeywords @@ -0,0 +1,27 @@ +#!/bin/bash +#include "errlog.sh" +#include "keywwords.sh" + +main() +{ + local file="$1" + local keywords="$2" + + echo "⭐ START: addkeywords @VERSION@" + + [ -n "$file" ] \ + || errlog "missing file" \ + || return $? + [ -f "$file" ] \ + || errlog "file $file does not exists" \ + || return $? + [ -n "$keywords" ] \ + || errlog "missing keywords" \ + || return $? + + add_keywords "$file" "$keywords" + + echo "✅ SUCCESS: addkeywords @VERSION@" +} + +main $* \ No newline at end of file diff --git a/src/addocr b/src/addocr index c9c562e..9fa585a 100644 --- a/src/addocr +++ b/src/addocr @@ -6,7 +6,7 @@ main() { local file="$1" - echo "⭐ START: addocr" + echo "⭐ START: addocr @VERSION@" [ -n "$file" ] \ || errlog "missing file" \ @@ -17,7 +17,7 @@ main() addocr "$file" - echo "✅ SUCCESS: addocr" + echo "✅ SUCCESS: addocr @VERSION@" } main $* \ No newline at end of file diff --git a/src/scantopdf b/src/scantopdf old mode 100755 new mode 100644 diff --git a/src/scantopdfbw b/src/scantopdfbw old mode 100755 new mode 100644 diff --git a/src/scantopdfgray b/src/scantopdfgray old mode 100755 new mode 100644 -- 2.47.3