From a2a76df29bbabb903c34b0d2c1979bb2f54f0f01 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 5 Jul 2025 13:34:23 +0200 Subject: [PATCH] change mult pdfs basename fix --- scanbasic.bats | 13 +++---------- scanbasic.sh | 11 ++++++----- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/scanbasic.bats b/scanbasic.bats index d9f6a76..10873c0 100755 --- a/scanbasic.bats +++ b/scanbasic.bats @@ -256,17 +256,10 @@ teardown() { assert_line --index 0 "true" } -@test "should failure createmultipdfs missing basename paramter" { - run createmultipdfs - - assert_failure - assert_line --index 0 "❌ ERROR: missing basename" -} - @test "should failure createmultipdfs tiff2pdf fails" { tiff2pdf_exit=1 - run createmultipdfs "base" + run createmultipdfs assert_failure assert_line --index 0 "❌ ERROR: could not convert scanned*.tiff to scanned*.pdf" @@ -275,14 +268,14 @@ teardown() { @test "should failure createmultipdfs rm tiff fails" { rm_exit=1 - run createmultipdfs "base" + run createmultipdfs assert_failure assert_line --index 0 "❌ ERROR: could not delete scanned*.tiff" } @test "should success createmutlipdfs" { - run createmultipdfs "base" + run createmultipdfs assert_success } diff --git a/scanbasic.sh b/scanbasic.sh index 5f0983f..f0c640f 100644 --- a/scanbasic.sh +++ b/scanbasic.sh @@ -155,7 +155,7 @@ detectsplit() createmultipdfs() { - local basename=$1 + local basename="multi" local startcount=1 local endcount=1 @@ -183,7 +183,9 @@ createmultipdfs() rm $pdf \ || errlog "could not delete $pdf" \ || return $? - createpdf $startcount $((endcount - 1)) $basename \ + createpdf "$startcount" \ + "$((endcount - 1))" \ + "$basename" \ || return $? startcount=$((endcount + 1)) fi @@ -223,11 +225,10 @@ scantopdf() { || return $? if [ "$output" == "multi" ]; then - createmultipdfs $pagecount \ - || return $? + createmultipdfs || return $? return fi - createonepdf $output \ + createonepdf "$output" \ || return $? } -- 2.47.3