X-Git-Url: https://zdv2.bktei.com/gitweb/BK-2020-03.git/blobdiff_plain/f06d25b954d7fc046d0f0bbd641feb5df721efd6..6b6fa9153c495e47991ffa2344e4da884b9d93a0:/user/htmlz_to_cbz.sh?ds=sidebyside

diff --git a/user/htmlz_to_cbz.sh b/user/htmlz_to_cbz.sh
index bf535f0..6552563 100755
--- a/user/htmlz_to_cbz.sh
+++ b/user/htmlz_to_cbz.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 # Desc: Collects .jpg/jpeg files from a Calibre .htmlz file into .cbz files
-# Version: 0.0.1
+# Version: 0.0.3
 
 for fin in ./*.htmlz; do
     (
         dout="${fin%.*}";
         unzip "$fin" -x / -d "$dout";
         pushd "$dout";
-        mapfile -t images < <(cat index.html  | grep -E "(.jpg|.jpeg)" | sed -E -e 's#.+(images/[0-9]+.(jpeg|jpg)).+#\1#');
+        mapfile -t images < <(cat index.html  | grep -E "(.jpg|.jpeg)" | sed -E -e 's#.+(images/[0-9]+.(jpeg|jpg)).+#\1#' | uniq; );
         dout="./output";
         if [[ -d "$dout" ]]; then
             rm -r "$dout";
@@ -26,7 +26,7 @@ for fin in ./*.htmlz; do
         if [[ -f "$faout" ]]; then
             rm "$fout";
         fi;
-        zip -r output.cbz output;
+        zip -j output.cbz output/*;
     ) &
 done;
 wait && echo "STATUS:Finished." 1>&2;