diff --git a/OGRI_B.sh b/OGRI_B.sh
index 65176e4fe739848e379fd2c33d0e6e221b58ee17..0f9e0d38ed7fb560789408f516000fdde548db56 100755
--- a/OGRI_B.sh
+++ b/OGRI_B.sh
@@ -32,7 +32,10 @@
# = VERSIONS = #
# ============ #
# #
- VERSION=1.0.220222ac #
+ VERSION=1.1.230216ac #
+# + updating finalizers for BLAST+ version >= 2.13.0 #
+# #
+# VERSION=1.0.220222ac #
# #
##############################################################################################################
@@ -130,7 +133,7 @@ EOF
PRODIGAL="$PRODIGAL_BIN $PRODIGAL_STATIC_OPTIONS";
# #
# -- NCBI BLAST+ (version >= 2.12.0) ---------------------------------------------------------------------- #
-# #
+#
# -- makeblastdb #
# #
MKBDB_BIN=makeblastdb;
@@ -183,6 +186,7 @@ EOF
if [ $# -lt 1 ]; then mandoc ; exit 1 ; fi
+export BLAST_USAGE_REPORT=false;
export LC_ALL=C ;
BREP=200; # -b
@@ -244,10 +248,10 @@ TMP1=$(randfile $FASTA1.tmp);
## defining traps ############################################################################################
finalizer() {
- rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ; echo -n " ." >&2 ;
- rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ; echo -n "." >&2 ;
- rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ; echo -n "." >&2 ;
- rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ; echo -n " exiting" >&2 ;
+ rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.njs $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ; echo -n " ." >&2 ;
+ rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.njs $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ; echo -n "." >&2 ;
+ rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.njs $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ; echo -n "." >&2 ;
+ rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pjs $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ; echo -n " exiting" >&2 ;
rm -f $OUT1 $TMP1 ;
}
trap 'finalizer;exit 1' INT ERR TERM ; echo -n "--" >&2 ;
@@ -368,15 +372,15 @@ do
## defining traps ##########################################################################################
finalizer() {
- rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ; echo -n " ." >&2 ;
- rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ; echo -n "." >&2 ;
- rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ; echo -n "." >&2 ;
- rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ; echo -n "." >&2 ;
+ rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.njs $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ; echo -n " ." >&2 ;
+ rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.njs $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ; echo -n "." >&2 ;
+ rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.njs $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ; echo -n "." >&2 ;
+ rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pjs $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ; echo -n "." >&2 ;
rm -f $OUT1 $TMP1 ; echo -n "." >&2 ;
- rm -f $FASTA2.ndb $FASTA2.nhr $FASTA2.nin $FASTA2.not $FASTA2.nsq $FASTA2.ntf $FASTA2.nto ; echo -n "." >&2 ;
- rm -f $FRAG2 $FRAG2.ndb $FRAG2.nhr $FRAG2.nin $FRAG2.not $FRAG2.nsq $FRAG2.ntf $FRAG2.nto ; echo -n "." >&2 ;
- rm -f $CDSN2 $CDSN2.ndb $CDSN2.nhr $CDSN2.nin $CDSN2.not $CDSN2.nsq $CDSN2.ntf $CDSN2.nto ; echo -n "." >&2 ;
- rm -f $CDSA2 $CDSA2.pdb $CDSA2.phr $CDSA2.pin $CDSA2.pot $CDSA2.psq $CDSA2.ptf $CDSA2.pto ; echo -n " exiting" >&2 ;
+ rm -f $FASTA2.ndb $FASTA2.nhr $FASTA2.nin $FASTA2.njs $FASTA2.not $FASTA2.nsq $FASTA2.ntf $FASTA2.nto ; echo -n "." >&2 ;
+ rm -f $FRAG2 $FRAG2.ndb $FRAG2.nhr $FRAG2.nin $FRAG2.njs $FRAG2.not $FRAG2.nsq $FRAG2.ntf $FRAG2.nto ; echo -n "." >&2 ;
+ rm -f $CDSN2 $CDSN2.ndb $CDSN2.nhr $CDSN2.nin $CDSN2.njs $CDSN2.not $CDSN2.nsq $CDSN2.ntf $CDSN2.nto ; echo -n "." >&2 ;
+ rm -f $CDSA2 $CDSA2.pdb $CDSA2.phr $CDSA2.pin $CDSA2.pjs $CDSA2.pot $CDSA2.psq $CDSA2.ptf $CDSA2.pto ; echo -n " exiting" >&2 ;
rm -f $OUT2 $TMP2 ;
}
trap 'finalizer;exit 1' INT ERR TERM ;
@@ -819,10 +823,10 @@ do
ci_raai="[$cil-$cir]"; echo -n "-" >&2 ; else echo -n "----------" >&2 ;
fi
- rm -f $FASTA2.ndb $FASTA2.nhr $FASTA2.nin $FASTA2.not $FASTA2.nsq $FASTA2.ntf $FASTA2.nto ;
- rm -f $FRAG2 $FRAG2.ndb $FRAG2.nhr $FRAG2.nin $FRAG2.not $FRAG2.nsq $FRAG2.ntf $FRAG2.nto ;
- rm -f $CDSN2 $CDSN2.ndb $CDSN2.nhr $CDSN2.nin $CDSN2.not $CDSN2.nsq $CDSN2.ntf $CDSN2.nto ;
- rm -f $CDSA2 $CDSA2.pdb $CDSA2.phr $CDSA2.pin $CDSA2.pot $CDSA2.psq $CDSA2.ptf $CDSA2.pto ;
+ rm -f $FASTA2.ndb $FASTA2.nhr $FASTA2.nin $FASTA2.njs $FASTA2.not $FASTA2.nsq $FASTA2.ntf $FASTA2.nto ;
+ rm -f $FRAG2 $FRAG2.ndb $FRAG2.nhr $FRAG2.nin $FRAG2.njs $FRAG2.not $FRAG2.nsq $FRAG2.ntf $FRAG2.nto ;
+ rm -f $CDSN2 $CDSN2.ndb $CDSN2.nhr $CDSN2.nin $CDSN2.njs $CDSN2.not $CDSN2.nsq $CDSN2.ntf $CDSN2.nto ;
+ rm -f $CDSA2 $CDSA2.pdb $CDSA2.phr $CDSA2.pin $CDSA2.pjs $CDSA2.pot $CDSA2.psq $CDSA2.ptf $CDSA2.pto ;
rm -f $OUT2 $TMP2 ; echo "[100%]" >&2 ;
@@ -918,10 +922,10 @@ do
done
-rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ;
-rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ;
-rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ;
-rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ;
+rm -f $FASTA1.ndb $FASTA1.nhr $FASTA1.nin $FASTA1.njs $FASTA1.not $FASTA1.nsq $FASTA1.ntf $FASTA1.nto ;
+rm -f $FRAG1 $FRAG1.ndb $FRAG1.nhr $FRAG1.nin $FRAG1.njs $FRAG1.not $FRAG1.nsq $FRAG1.ntf $FRAG1.nto ;
+rm -f $CDSN1 $CDSN1.ndb $CDSN1.nhr $CDSN1.nin $CDSN1.njs $CDSN1.not $CDSN1.nsq $CDSN1.ntf $CDSN1.nto ;
+rm -f $CDSA1 $CDSA1.pdb $CDSA1.phr $CDSA1.pin $CDSA1.pjs $CDSA1.pot $CDSA1.psq $CDSA1.ptf $CDSA1.pto ;
rm -f $OUT1 $TMP1 ;
exit ;