Hide error output from which command

Local version is used if a global system version isn't found. Without
this redirect, the error response from which is shown on the terminal,
even though everything is OK.

GETTING_STARTED.md

@@ -81,7 +81,6 @@ or
 
 `wget --directory-prefix=./ https://www.hackerpublicradio.org/hpr.sql`
 
-You can process the file using SQLite:
 ## Creating an SQLite database file
 
 The SQL of the hpr.sql file must be converted from MySQL specific statements to 
@@ -96,11 +95,11 @@ program which creates the hpr.db file:
 
 `./utils/mysql2sqlite ./hpr-sqlite.sql | sqlite3 ./hpr.db`
 
-For convenience, the update-hpr-db.sh script in the utils directory
+For convenience, the update-sqlite-db.sh script in the utils directory
 automates the above steps (including downloading the hpr.sql file). 
 From the root of the local hpr_generator repository run:
 
-`./utils/update-hpr-db.sh`
+`./utils/update-sqlite-db.sh`
 
 # Configure the site-generator
 
@@ -112,7 +111,7 @@ file are found in the comments within the file.
 
 Any database supported by the Perl:DBI and Perl::DBD modules can be used with 
 the site-generator program. Currently the hpr_generator project works with 
-an SQLite database.
+a MySQL or SQLite database.
 
 Find the [DBI] section of the file. It should look like the following
 
@@ -123,8 +122,15 @@ Find the [DBI] section of the file. It should look like the following
 #driver: dbi:SQLite:hpr.db 
 #user:        (not used - leave blank)
 #password:    (not used - leave blank)
+# Configuration settings for MySQL
+#database: mysql
+#driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
+#user: hpr-generator  (Suggested user with read-only privileges)
+#password: *********  (Password for user)
 ```
 
+### SQLite
+
 Remove the comment character from the start of the database and driver 
 option lines:
 
@@ -140,6 +146,26 @@ The hpr.db section of the driver option `dbi:SQLite:hpr.db` is the path
 to the sqlite file. The default assumes the hpr.db file is located in the same
 directory as the site-generator. 
 
+### MySQL
+
+Remove the comment character from the start of the database, driver, 
+user, and password option lines:
+
+ ```
+# Configuration settings for MySQL
+database: mysql
+driver: dbi:mysql:database=hpr_hpr:hostname=localhost 
+user: hpr-generator
+password: *********
+```
+
+This assumes that the MySQL database service is available at the localhost 
+hostname, that the database name (hpr_hpr) is the database created from 
+the hpr.sql dump file or manually created by you, that the user (hpr-generator) 
+was added by you and has read rights to the hpr_hpr database, and that the 
+password (replace ********* with the actual password) matches the password set 
+for the hpr-generator database user.
+
 ## Configuring the website for viewing locally
 
 For HTML links to work when viewing the files on your local machine using the 

README.md

@@ -1,47 +1,65 @@
 # hpr_generator
-
 Static web page generator for the Hacker Public Radio website.
 
 ## Installation
-Steps necessary to install this generator locally:
 * Clone or download this repository
-* Install the needed Perl modules using your preferred method (distribution
-  packages, CPAN, etc.)
+* With SQLite
+	* Create the sqlite3 database from the hpr.sql MySQL dump file available on
+	  hackerpublicradio.org. The default name for the database file is "hpr.db"
+	  and should be located in the root of the project directory. The name and
+	  location can be set in the site.cfg file.
+	* An "update-hpr.sh" helper script is available in the utils directory. This
+	  script will download the hpr.sql file, convert it to the SQLite hpr.db file,
+	  and regenerate the website using the site-generator.
+		1. `cd` into the root of the project directory
+		2.  Run `./utils/update-hpr.sh`
+	* SQLite v3.8.3 or greater is recommended. CTE WITH clauses are used in some template queries. Must convert WITH
+	  clauses to sub-queries when using earlier versions of SQLite.
+* With MySQL
+	* Create database hpr_hpr in the MySQL server from HPR dump file.
+		- ``sudo mysql --host=localhost < hpr.sql``
+	* Create a user that will be used by the site-generator.
+		- Suggested username: hpr-generator
+		- ``CREATE USER 'hpr-generator'@'localhost' IDENTIFIED BY '<password>';``
+	* Limit the user's privileges to EXECUTE and SELECT
+		- ``GRANT SELECT ON hpr_hpr.* TO 'hpr-generator'@'localhost';``
+		- ``GRANT EXECUTE ON `hpr_hpr`.* TO 'hpr-generator'@'localhost';``
+* Install the needed Perl modules using preferred method (distribution packages, CPAN, etc.)
+    * Getopt::Long
+    * Pod::Usage
+    * Config::Std
+    * Template
+    * Template::Plugin::File
+    * Template::Plugin::DBI
+    * Template::Plugin::Date
+    * Template::Plugin::HTML::Strip
+    * DBI
+    * Tie::DBI
+    * DBD::SQLite or DBD::mysql
+    * Date::Calc
+    * Text::CSV_XS
+    * HTML::Entities
+
+* See the [Getting Started](GETTING_STARTED.md) tutorial for more details on
+  installing the HPR generator.
 
 ## Usage
-The following utilities are provided to support the process of
-generating the website:
-    * `utils/update-hpr-db.sh` - Download the database and transform it
-      into the hpr.db SQLite database.
-    * `utils/update-hpr.sh` - Download HPR.sql and create the SQLite database
-      using `update-hpr-db.sh`, then run `site-generator` to create the
-      website.
-    * `./site-generator` - Using the information in the templates
-      directory and the show information in the database, generate the
-      website. Without parameters, the whole site will be generated. 
+Generate two specific pages:
+`site-generator index about`
 
-If you need to generate specific pages (in this example, index and about):
-    `site-generator index about`
-
-Having downloaded the database, you can also regenerate the whole site:
-    `site-generator --all`
+Generate the whole site:
+`site-generator --all`
 
 Generate pages based on the same template:
 `site-generator correspondent=1,3,5..10`
- 
-## More Information
-* See the [Getting Started](GETTING_STARTED.md) tutorial for more details on
-  installing and using the HPR generator.
 
 ## Support
-
 Please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues),
 and add the label "**Help Request**" for help running or installing the site-generator.
 
 For discussing HPR site generation in general, please [submit an Issue](https://repo.anhonesthost.net/HPR/hpr_generator/issues) and add the label "**General Discussion**".
 
 ## Contributing
-
 Happy to take any contributions or suggestions.
 
 To contribute code or documentation, please create a fork of the project and [submit a pull request](https://repo.anhonesthost.net/HPR/hpr_generator/pulls) or send a patch. If an issue exists that is related to your patch, please assign the issue to yourself, or if it is already assigned to someone else, please coordinate with them to minimize duplicated efforts.
@@ -53,13 +71,9 @@ To make a suggestion, please [submit an Issue](https://repo.anhonesthost.net/HPR
 and add the label "**Feature Request**".
 
 ## Authors and acknowledgment
-
 * Roan "Rho`n" Horning
 * Dave Morriss
 * gordons
 * Ken Fallon
 * norrist
-* Paul Jewell (paulj)
 
-  
-  

templates/content-about.tpl.html

@@ -80,7 +80,7 @@
   <p>
   Our hosting is kindly provided by <a href="<!--% absolute_url(baseurl) %-->correspondents/0174.html">Josh</a> from 
   <a href="https://anhonesthost.com/shared-hosting/">AnHonestHost.com</a>. 
-  We would appreciate it if you could <a href="https://secure.anhonesthost.com/store/hpr-hosting-cost-donations">donate</a> to help 
+  We would appreciate it if you could <a href="https://secure.anhonesthost.com/cart.php?gid=17">donate</a> to help 
   reduce his costs in funding the hosting. He is also accepting bitcoins to <em>1KsxJr9HtsdaUeU7yaV9bk9bQi21UPBtUq</em>
   </p>
   <p>

templates/content-index.tpl.html

@@ -62,7 +62,7 @@
 <!--% listen_now(latest_episodes, "hpr", baseurl, media_baseurl) %-->
 		</p>
 	</header>
-		<p>See <a href="<!--% absolute_path(baseurl) %-->eps/hpr<!--% zero_pad_left(latest_episodes.id) %-->/index.html">episode show notes</a> for more information.</p>
+		<!--% tidy_notes(latest_episodes.notes) %-->
 </article>
 <!--% host_cnt = host_cnt + 1 %-->
 <!--% END %-->

templates/page.tpl.html

@@ -81,7 +81,7 @@
     <nav class="column">
       <h2>Social</h2>
       <ul>
-        <li><a href="https://lists.hackerpublicradio.com/mailman/listinfo/hpr" >Mailing list</a></li>
+        <li><a href="<!--% absolute_url(baseurl,'/maillist') %-->" >Mailing list</a></li>
         <li><a rel="me" href="https://infosec.exchange/@hpr" >Mastodon</a></li>
         <li><a href="https://matrix.to/#/#hpr:matrix.org" >Matrix</a></li>
         <li><a href="mumble://chatter.skyehaven.net:64738/Hacker%20Public%20Radio?version=1.2.0" >Mumble</a></li>

templates/rss-comments.tpl.xml

@@ -3,10 +3,9 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS 'shared-episode-summary.tpl.html' %-->
 <!--% USE date %-->
-<!--% USE HTML.Strip emit_spaces = 0 %-->
 <channel>
   <title>Hacker Public Radio ~ Comment Feed</title>
-  <link><!--% absolute_url(http_baseurl) %-->about.html</link>
+  <link><!--% baseurl %-->about.html</link>
   <description>Comments Feed: Hacker Public Radio is a podcast that releases shows every weekday Monday through Friday. Our shows are produced by the community (you) and can be on any topic that is of interest to hackers and hobbyists.</description>
   <language>en-us</language>
   <copyright>Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License</copyright>
@@ -16,14 +15,14 @@
   <docs>https://www.rssboard.org/rss-specification</docs>
   <ttl>600</ttl>
   <image>
-    <url><!--% absolute_url(http_baseurl) %-->images/hpr_feed_small.png</url>
+    <url><!--% baseurl %-->images/hpr_feed_small.png</url>
     <title>Hacker Public Radio ~ Comment Feed</title>
-    <link><!--% absolute_url(http_baseurl) %-->about.html</link>
+    <link><!--% baseurl %-->about.html</link>
     <description>The Hacker Public Radio Old Microphone Logo</description>
     <height>164</height>
     <width>144</width>
   </image>
-  <atom:link href="<!--% absolute_url(http_baseurl) %-->comments.rss" rel="self" type="application/rss+xml" />  
+  <atom:link href="<!--% baseurl %-->comments.rss" rel="self" type="application/rss+xml" />  
   <!--% USE DBI(constants.driver, constants.user, constants.password) %-->
   <!--% FOREACH response IN DBI.query('SELECT max( comment_timestamp) AS latest_update FROM comments') %-->
   
@@ -50,15 +49,15 @@
   %-->
 
   <item>
-    <title><!--% item.comment_author_name | html_strip | xml_entity %--> says: <!--% item.comment_title | html_strip | xml_entity %--></title>
-    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name | html_strip | xml_entity %-->)</author>
-    <link><!--% absolute_url(http_baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comments</link>
+    <title><!--% item.comment_author_name %--> says: <!--% item.comment_title %--></title>
+    <author>feedback.nospam@nospam.hackerpublicradio.org (<!--% item.comment_author_name %-->)</author>
+    <link><!--% baseurl %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comments</link>
     <description><![CDATA[<strong>
-    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title | html_strip | xml_entity %--></em> by <a href="<!--% absolute_url(http_baseurl) %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) | html_strip | xml_entity %--><br />
+    RE: hpr<!--% zero_pad_left(item.eps_id) %-->::<!--% item.episode_date %--> <em><!--% item.episode_title %--></em> by <a href="<!--% baseurl %-->correspondents/<!--% zero_pad_left(item.host_id) %-->.html"><!--% item.host %--></a></strong><!--% rss_show_series(item.series_name, item.series_id) %--><br />
 <!--% display_episode_duration(item.episode_duration) %--><!--% display_listen_in(item.eps_id) %--><br /><!--% item.comment_text FILTER html_line_break %-->
 ]]></description>
     <pubDate><!--% format_feed_date(item.comment_timestamp) %--></pubDate>
-    <guid isPermaLink="false"><!--% absolute_url(http_baseurl) %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comment_<!--% item.id %--></guid>
+    <guid isPermaLink="false"><!--% baseurl %-->eps/hpr<!--% zero_pad_left(item.eps_id) %-->/index.html#comment_<!--% item.id %--></guid>
   </item>
   <!--% END %-->
 </channel>

utils/lib_utils.sh

@@ -132,7 +132,7 @@ function make_hpr_sqlite_db {
 		return 1
 	fi
 
-	local MYSQL2SQLITE=`which mysql2sqlite`
+	local MYSQL2SQLITE=`which mysql2sqlite 2>/dev/null`
 	local BIN_PATH=""
 
 	if [ "$MYSQL2SQLITE" = "" ];