Update to v2.1.5:v2.1.5

  Fixed: Properly escape entries with a '%'

6 files changed, 18 insertions, 12 deletions

diff --git a/Changelog b/Changelog
index 801ccc6..8b6bd54 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2.1.5:
+
+  * Fixed: Properly escape entries with a '%'
+
+
 2.1.4:
 
   * New: Allow for comma separated list of references in aux_cmd.
diff --git a/Makefile b/Makefile
index fcef28a..9c4a750 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-## Copyright Ian Jauslin 2015-2019
+## Copyright Ian Jauslin 2015-2022
 ## 
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index 432da00..2693a53 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,2 @@
 BBlog
-Copyright Ian Jauslin 2015-2019
+Copyright Ian Jauslin 2015-2022
diff --git a/bin/BBlog b/bin/BBlog
index 9d63581..0c8b525 100755
--- a/bin/BBlog
+++ b/bin/BBlog
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## Copyright Ian Jauslin 2015-2019
+## Copyright Ian Jauslin 2015-2022
 ## 
 ## Licensed under the Apache License, Version 2.0 (the "License");
 ## you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 enginedir=/usr/share/BBlog/engines
 
 # version
-version=2.1.4
+version=2.1.5
 
 function print_config {
   echo "engine: $engine"
@@ -235,12 +235,13 @@ function replace_format {
     out="${out//\%$command\%/$replacement}"
   done
 
-  # un-escape '%' in replacement
-  out="${out//::iansays:percent::/\%}"
-
   # finish replacing newlines
   out="${out//\\n/%}"
   out=$(echo "$out" | tr "%" "\n")
+
+  # un-escape '%' in replacement
+  out="${out//::iansays:percent::/\%}"
+
   echo "$out"
 }
 
diff --git a/man/man1/BBlog.1 b/man/man1/BBlog.1
index 6303c38..d233c03 100644
--- a/man/man1/BBlog.1
+++ b/man/man1/BBlog.1
@@ -1,5 +1,5 @@
-.Dd $Mdocdate: November 13 2019 $
-.Dt BBLOG 2.1.4
+.Dd $Mdocdate: September 9 2022 $
+.Dt BBLOG 2.1.5
 .Os
 .Sh NAME
 .Nm BBlog
@@ -194,6 +194,6 @@ automatically adds a letter (from 'b' to 'z') at the end of non-unique tokens, i
 .Nm
 was written by Ian Jauslin.
 .Sh COPYRIGHT
-copyright Ian Jauslin 2015-2019
+copyright Ian Jauslin 2015-2022
 .Sh SEE ALSO
 .Sx BBlog-sqlite Ns (7)
diff --git a/man/man7/BBlog-sqlite.7 b/man/man7/BBlog-sqlite.7
index 8423b2e..c189d92 100644
--- a/man/man7/BBlog-sqlite.7
+++ b/man/man7/BBlog-sqlite.7
@@ -1,4 +1,4 @@
-.Dd $Mdocdate: Novermber 5 2019 $
+.Dd $Mdocdate: November 5 2019 $
 .Dt BBLOG-sqlite
 .Os
 .Sh DESCRIPTION
@@ -32,7 +32,7 @@ label of the reference
 .Sh AUTHORS
 The sqlite BBlog engine was written by Ian Jauslin.
 .Sh COPYRIGHT
-copyright Ian Jauslin 2015-2019
+copyright Ian Jauslin 2015-2022
 .Sh SEE ALSO
 .Sx BBlog Ns (1) ,
 .Sx sqlite3 Ns (1)