change mult pdfs basename fix

diff --git a/scanbasic.bats b/scanbasic.bats
index d9f6a761a04dcc59a0ca103a1133c2c67c63a6ab..10873c0aeeb934c16b73f0456b61ef16ab18e5b1 100755 (executable)
--- 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 5f0983ff69e615cfa7196567dd50fde7f8d46057..f0c640fb120afb4f5e39d1815875d0c2f3e9d9df 100644 (file)
--- 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 $?
 }