0.20180810

fb2xmlfix: fix error xmlstarlet
BASH-Auto-Tools · Aug 10, 2018 · 6d38e6c · 6d38e6c
1 parent 124cf10
commit 6d38e6c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 Console FB2 reader
 https://github.com/zvezdochiot/bash-fb2
 
+0.20180810
+
+ fb2xmlfix: fix error xmlstarlet
+
 0.20180806
 
  fb2encode: fix error iconv

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.20180806
+0.20180810
diff --git a/scripts/fb2encode.sh b/scripts/fb2encode.sh
@@ -4,7 +4,7 @@
 #Depends: dash, grep, sed, tr, iconv
 
 sname="Fb2Encode"
-sversion="0.20180806"
+sversion="0.20180810"
 
 echo "$sname $sversion" >&2
 

diff --git a/scripts/fb2toinfo.sh b/scripts/fb2toinfo.sh
@@ -4,7 +4,7 @@
 #Depends: dash, sed, file, unzip, zcat
 
 sname="Fb2toinfo"
-sversion="0.20180806"
+sversion="0.20180810"
 
 echo "$sname $sversion" >&2
 

diff --git a/scripts/fb2totxt.sh b/scripts/fb2totxt.sh
@@ -4,7 +4,7 @@
 #Depends: dash, sed, file, less, unzip, zcat
 
 sname="Fb2totxt"
-sversion="0.20180806"
+sversion="0.20180810"
 
 echo "$sname $sversion" >&2
 

diff --git a/scripts/fb2tozip.sh b/scripts/fb2tozip.sh
@@ -4,7 +4,7 @@
 #Depends: dash, zip, unzip
 
 sname="Fb2toZip"
-sversion="0.20180806"
+sversion="0.20180810"
 
 echo "$sname $sversion" >&2
 

diff --git a/scripts/fb2xmlfix.sh b/scripts/fb2xmlfix.sh
@@ -4,7 +4,7 @@
 #Depends: dash, xmlstarlet
 
 sname="Fb2XMLFix"
-sversion="0.20180806"
+sversion="0.20180810"
 
 echo "$sname $sversion" >&2
 
@@ -56,11 +56,17 @@ if [ -f "$src" ]
 then
  if [ "x$fquiet" = "xtrue" ]
  then
- xmlstarlet fo -R -Q "$src" > "$src.verify.xml"
+ xmlstarlet fo -R -Q "$src" > "verify.$$.xml"
  else
- xmlstarlet fo -R "$src" > "$src.verify.xml"
+ xmlstarlet fo -R "$src" > "verify.$$.xml"
+ fi
+ if [ -s "verify.$$.xml" ]
+ then
+ mv -fv "verify.$$.xml" "$dst"
+ else
+ rm -fv "verify.$$.xml"
+ echo " $src not parse!" >&2
  fi
- mv -fv "$src.verify.xml" "$dst"
 else
  echo "$src not fb2 file!" >&2
 fi