From 90479b0ac1e990820e7a01ec58685b217f138d96 Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@librem.one>
Date: Mon, 17 Oct 2022 01:31:36 -0400
Subject: stuff: update

---
 bookmark.sh |  5 +++--
 makeplan.sh | 11 +++++++++--
 usfm2gmi    |  2 +-
 webp.py     |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bookmark.sh b/bookmark.sh
index b8d6a0d..5c7ffef 100755
--- a/bookmark.sh
+++ b/bookmark.sh
@@ -2,10 +2,11 @@
 # Place this script in your /cgi-bin to get your own bookmark writing script!
 
 # Have your host key put here for yourself.
-authorized="SHA256:09CC327F3DDB21AE3BA4D0F38A6757236C8C2965A90539C640E14EB087955071 Gerbil@laptop"
+authorized="SHA256:09CC327F3DDB21AE3BA4D0F38A6757236C8C2965A90539C640E14EB087955071 Gerbil@laptop
+SHA256:DBF363CB8BB8CBCBEAC72D65ABF1D845319B404E856217166E1B6138FA8B83A8 gerbil@pp"
 
 # Authorization guard.
-if ! test "$REMOTE_USER"; then
+if ! test "$TLS_CLIENT_HASH"; then
 	printf '60 Try again with a client cert!\r\n'
 	exit
 elif ! test "$(printf "$authorized" | grep "^$TLS_CLIENT_HASH ")"; then
diff --git a/makeplan.sh b/makeplan.sh
index ad53ee8..2cd5825 100644
--- a/makeplan.sh
+++ b/makeplan.sh
@@ -8,18 +8,25 @@ ps="$(grep "^$day" "$1" | cut -f4)"
 pr="$(grep "^$day" "$1" | cut -f5)"
 
 if [ -e /srv/gemini.zachdecook.com/oyb/$day.mp3 ]; then
-	echo "=> /oyb/$day.mp3 Listen to today's reading!"
+	echo "=> /oyb/$day.mp3 Listen to today's reading by Zach!"
+elif [ -e /srv/gemini.zachdecook.com/oyb/$day.ogg ]; then
+	echo "=> /oyb/$day.ogg Listen to today's reading by Zach!"
 fi
+echo "=>/cgi-bin/aoyb.sh/tomdooley/$(date +%m%d).mp3 Listen to today's reading by Tom Dooley © MasterMedia Ministries/Tyndale."
 cd "$(dirname "$0")"
 echo "# Old Testament Reading"
 ./webp.py "$ot" |grep -v 'text/gemini'
+gcat "gemini://songs.zachdecook.com/searchVerse.gmi?$ot" | grep -v '^51\ ' | grep -v '^20\ '
 
 echo "# New Testament Reading"
 ./oeb.py "$nt" |grep -v 'xt/ge'
+gcat "gemini://songs.zachdecook.com/searchVerse.gmi?$nt" | grep -v '^51\ ' | grep -v '^20\ '
 
 echo "# Psalm"
 ./oeb.py "$ps" |grep -v 'xt/ge'
+gcat "gemini://songs.zachdecook.com/searchVerse.gmi?$ps" | grep -v '^51\ ' | grep -v '^20\ '
 
 echo "# Proverb"
-./webp.py "$pr" | grep -v 'xt/ge'
+./lsv.py "$pr" | grep -v 'xt/ge'
+gcat "gemini://songs.zachdecook.com/searchVerse.gmi?$pr" | grep -v '^51\ ' | grep -v '^20\ '
 
diff --git a/usfm2gmi b/usfm2gmi
index e0d2aec..21a75c1 160000
--- a/usfm2gmi
+++ b/usfm2gmi
@@ -1 +1 @@
-Subproject commit e0d2aec2d5e75211eadc42b4442961c977f393f7
+Subproject commit 21a75c18879896bd5380b37551bf28f473f6105a
diff --git a/webp.py b/webp.py
index 7532b13..20e406f 100755
--- a/webp.py
+++ b/webp.py
@@ -34,7 +34,7 @@ def main(qs):
     printing = 0
     inendc = False
     bookn = passage.start.book
-    eprint(bookn)
+    #eprint(bookn)
     f = open(books[bookn])
     startc = passage.start.chapter
     startv= passage.start.verse
-- 
cgit 1.4.1