fix file name pattern msg

diff --git a/Makefile b/Makefile
index bf432c87beb1acdf6c56ded0d94adf3e3f7c8d56..b597edc96d75719e012b66aaf5de5c939ebacd13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ test:
 
 build: build/$(PACKAGENAME)/usr/local/bin/scantopdf \
        build/$(PACKAGENAME)/usr/local/bin/scantopdfgray \
-       build/$(PACKAGENAME)/usr/local/bin/scantopdfbw \
+       build/$(PACKAGENAME)/usr/local/bin/scantopdfbw
 
 build/$(PACKAGENAME)/usr/local/bin:
        mkdir -p build/$(PACKAGENAME)/usr/local/bin

diff --git a/src/scanbasic.sh b/src/scanbasic.sh
index f72daef2ce1437109f1a8ba42c8f44246423ad44..cc8e6655dea04735e202c3181e21afbaee6430e3 100644 (file)
--- a/src/scanbasic.sh
+++ b/src/scanbasic.sh
@@ -272,7 +272,7 @@ scantopdf() {
                || return $?
        [ -z "$keywords" ] \
                || [[ "$output" =~ [0-9]{4}\-[0-9]{2}\-[0-9]{2}_.*\.pdf ]] \
-               || errlog "file name mismatch pattern" \
+               || errlog "file name mismatch pattern yyyy-MM-dd_<filename>.pdf" \
                || return $?
 
        scanimage --source=DocumentFeeder \

diff --git a/tests/scanbasic.bats b/tests/scanbasic.bats
index 41e383ea111d2bd755deabe5c41080b4bda4d840..6eb67cdecc99dc11deb95a842e972714d12af410 100755 (executable)
--- a/tests/scanbasic.bats
+++ b/tests/scanbasic.bats
@@ -333,5 +333,5 @@ setup() {
        run scantopdf "Color" "1" "wrong_name.pdf" "keywords"
 
        assert_failure
-       assert_line --index 0 "❌ ERROR: file name mismatch pattern"
+       assert_line --index 0 "❌ ERROR: file name mismatch pattern yyyy-MM-dd_<filename>.pdf"
 }