From ccd4f4d051cb274f2733a22388bd44fd93a8b4f7 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 15:10:14 -0700 Subject: [PATCH 01/22] Of course I think of something AFTER the release, lol! Reset the photo index file so that any changed CSS is adapted. --- cronjob.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index 0d8eb51..08fd0b3 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -25,7 +25,8 @@ function kill-project { } function reload-project { - # Nothing to do, run.sh and main.js automatically uses the latest files. + # Not much to do, run.sh and main.js automatically uses the latest files. + rm -v files/photos/index.html log "Project reloaded successfully!" } -- 2.49.1 From 1cd182b3a99d6ec9d6e92c6275def0b9eb6889df Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 15:13:24 -0700 Subject: [PATCH 02/22] Rename cronjob.sh to check_git.sh. Eventually do the same with the photo checker code so that it can be called from check_git. --- cronjob.sh => check_git.sh | 1 + run.sh | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename cronjob.sh => check_git.sh (96%) diff --git a/cronjob.sh b/check_git.sh similarity index 96% rename from cronjob.sh rename to check_git.sh index 08fd0b3..be2586d 100755 --- a/cronjob.sh +++ b/check_git.sh @@ -27,6 +27,7 @@ function kill-project { function reload-project { # Not much to do, run.sh and main.js automatically uses the latest files. rm -v files/photos/index.html + # TBD/TODO: Call check_photos.sh once it has been pulled from run.sh. log "Project reloaded successfully!" } diff --git a/run.sh b/run.sh index 2ffa7fa..bd972e7 100755 --- a/run.sh +++ b/run.sh @@ -123,6 +123,7 @@ log "Removing old index files." find files/photos/ -name "*".html -print -delete { check_main photos + # TBD/TODO: Move this section to check_photos.sh similar to check_git.sh. count=1 http_code=0 port="${ports%% *}" @@ -148,10 +149,10 @@ find files/photos/ -name "*".html -print -delete ## Main ## -log "Start local cronjob." +log "Start check_git." while true; do - check_main cronjob - $DIR/cronjob.sh + check_main check_git + $DIR/check_git.sh sleep 30 done & -- 2.49.1 From 616663ffe0550be21146ef702d588305e252ccc8 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Wed, 15 Oct 2025 05:01:33 -0700 Subject: [PATCH 03/22] Move photo checking out of run.sh and into its own script. --- check_photos.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ run.sh | 23 +---------------------- 2 files changed, 47 insertions(+), 22 deletions(-) create mode 100755 check_photos.sh diff --git a/check_photos.sh b/check_photos.sh new file mode 100755 index 0000000..b55c1bb --- /dev/null +++ b/check_photos.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash +# 2025-10-15 Hyperling +# Create script which does the photo checking so that it can be called by +# scripts other than just run.sh, such as if it needs used in check_git.sh. + +## Setup ## + +DIR="$(dirname -- "${BASH_SOURCE[0]}")" +PROG="$(basename -- "${BASH_SOURCE[0]}")" +cd $DIR +DIR="`pwd`" +NAME="'$PROG'" + +function log { + echo -e "`date` : $NAME - $1" +} + +## Parameters ## + +ports="$1" + +## Main ## + +count=1 +http_code=0 +port="${ports%% *}" +photos_uri=":$port/photos/" +beg_time="$SECONDS" +while [[ $http_code != "200" ]]; do + log "Sleeping for '$count' while waiting for $photos_uri to come up." + sleep $count + log "Checking if $photos_uri is available." + http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`" + log "Check for $photos_uri responded with '$http_code'." + if (( $count >= 10 )); then + log "Giving up on loading $photos_uri after '$count' attempts." + break + else + count=$(( count + 1 )) + fi +done +end_time="$SECONDS" +time="$(( $end_time - $beg_time ))" +log "Finished checking for /photos/ after '$time' seconds." + +exit 0 diff --git a/run.sh b/run.sh index bd972e7..7031151 100755 --- a/run.sh +++ b/run.sh @@ -123,28 +123,7 @@ log "Removing old index files." find files/photos/ -name "*".html -print -delete { check_main photos - # TBD/TODO: Move this section to check_photos.sh similar to check_git.sh. - count=1 - http_code=0 - port="${ports%% *}" - photos_uri=":$port/photos/" - beg_time="$SECONDS" - while [[ $http_code != "200" ]]; do - log "Sleeping for '$count' while waiting for $photos_uri to come up." - sleep $count - log "Checking if $photos_uri is available." - http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`" - log "Check for $photos_uri responded with '$http_code'." - if (( $count >= 10 )); then - log "Giving up on loading $photos_uri after '$count' attempts." - break - else - count=$(( count + 1 )) - fi - done - end_time="$SECONDS" - time="$(( $end_time - $beg_time ))" - log "Finished checking for /photos/ after '$time' seconds." + $DIR/check_photos.sh "$ports" } & ## Main ## -- 2.49.1 From eaf8d2e0bb4f91f7f020b00c5c29e155f969315b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Wed, 15 Oct 2025 06:52:38 -0700 Subject: [PATCH 04/22] Update wording now that there are multiple links. --- pages/freedom.php | 2 +- pages/health.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/freedom.php b/pages/freedom.php index 58e5c2e..c4c2bcb 100755 --- a/pages/freedom.php +++ b/pages/freedom.php @@ -29,7 +29,7 @@

- Click the link below to download the 4-page PDF: + Use the links below to download the 4-page PDF:

  • diff --git a/pages/health.php b/pages/health.php index e47b16d..515cb93 100755 --- a/pages/health.php +++ b/pages/health.php @@ -30,7 +30,7 @@

    - Click the link below to download the 10-page PDF: + Use the links below to download the 10-page PDF:

    • -- 2.49.1 From b5ea457491f340e0d127c25e1ba636276dc2a888 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Wed, 15 Oct 2025 09:52:04 -0700 Subject: [PATCH 05/22] Remove comments which may have some malformed portions showing up on the site. --- pages/helpers/banner.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 510ae86..2feac12 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -10,11 +10,7 @@
      - >" - >--> -
      + ';?>
      header"> @@ -22,11 +18,7 @@
      - -
    + ';?>
    -- 2.49.1 From 5ad44a8056c28be5a929ba8c7c6826bd141fcd26 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 17 Oct 2025 14:10:11 -0700 Subject: [PATCH 06/22] Remove excess div closure. --- pages/helpers/banner.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 2feac12..8aa8212 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -20,5 +20,4 @@
';?> -
-- 2.49.1 From ff1cf74a00c40856294ff4ff6c373b0aa7ebb369 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 17 Oct 2025 14:12:36 -0700 Subject: [PATCH 07/22] Remove unnecessary trailing slashes from meta attributes. --- pages/helpers/header.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pages/helpers/header.php b/pages/helpers/header.php index 1d57e9b..8e3ece3 100755 --- a/pages/helpers/header.php +++ b/pages/helpers/header.php @@ -30,16 +30,16 @@ - - - - - - - + + + + + + + - - - - + + + + -- 2.49.1 From 30a8041fa84c7686745f63c3cdc1a0212e27b631 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 17 Oct 2025 14:14:26 -0700 Subject: [PATCH 08/22] Change order of `i` and `h2` tags, specify that `i` should be purple in this context. --- pages/helpers/advisory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/helpers/advisory.php b/pages/helpers/advisory.php index e349a49..8726f84 100755 --- a/pages/helpers/advisory.php +++ b/pages/helpers/advisory.php @@ -7,7 +7,7 @@
-- 2.49.1 From a1a02500e47d4f5e314bc5d6c2eb9f0b541d42d0 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 17 Oct 2025 14:19:04 -0700 Subject: [PATCH 10/22] Fix formatting and add back the removed div. --- pages/helpers/banner.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 8aa8212..16809ef 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -9,15 +9,16 @@ ?>
-
- ';?> -
header"> - - - +
+ ';?> +
header"> + + + +
+
+ ';?> - - ';?> -- 2.49.1 From 2feb3e88cc918a9a864ee4889a7d63c3171447e2 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 17 Oct 2025 14:19:57 -0700 Subject: [PATCH 11/22] Move comment to be after document start. --- pages/home.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/home.php b/pages/home.php index 4d86cf8..72602fc 100755 --- a/pages/home.php +++ b/pages/home.php @@ -1,13 +1,13 @@ #!/usr/bin/php - +

Welcome!

Date: Fri, 17 Oct 2025 14:27:53 -0700 Subject: [PATCH 12/22] Move PHP comments into PHP tags since they do not need to be on the website and were in front of the Doc Start tag. --- pages/apps.php | 4 +--- pages/books.php | 4 +--- pages/donate.php | 4 +--- pages/freedom.php | 4 +--- pages/health.php | 4 +--- pages/home.php | 4 +--- pages/media.php | 4 +--- pages/resources.php | 4 +--- pages/resume.php | 4 +--- pages/support.php | 4 +--- pages/videos.php | 8 ++++---- 11 files changed, 14 insertions(+), 34 deletions(-) diff --git a/pages/apps.php b/pages/apps.php index 09e2e54..a438716 100755 --- a/pages/apps.php +++ b/pages/apps.php @@ -1,8 +1,6 @@ #!/usr/bin/php - -

Welcome!

Date: Wed, 22 Oct 2025 19:06:28 -0700 Subject: [PATCH 13/22] Add 3rd row with subdomains Blog and Recipes. --- pages/helpers/menu.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index 9f8dcc6..e0eeca2 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -16,4 +16,18 @@
  • Photos
    • +
    -- 2.49.1 From f8d2e3ea086d6748baa71c14cf905253f0a8ffbe Mon Sep 17 00:00:00 2001 From: Hyperling Date: Wed, 22 Oct 2025 19:34:01 -0700 Subject: [PATCH 14/22] Comment the 3rd row for now. Still deciding on it. --- pages/helpers/menu.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index e0eeca2..78f4bf1 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -16,8 +16,9 @@
  • Photos
    • + +
  • Recipes
    • -
    • +
  • + -->
    -- 2.49.1 From cfe7535c3224c14e9dc5ac2070b463304f5d0431 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 16 Nov 2025 20:43:06 -0700 Subject: [PATCH 15/22] Greatly enhance the menu by no longer forcing it into columns. Allows much much in much less space!! --- pages/helpers/menu.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index 78f4bf1..d3c8b87 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -1,5 +1,6 @@ #!/usr/bin/php
    + + +

    + Main : + Home + Apps + About + Contact + Support + | Media : + Books + Videos + Photos + Recipes + Poetry

    -- 2.49.1 From ab2dc2221370afebe359241f8592b6ba8fe1d791 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 21 Nov 2025 08:52:37 -0700 Subject: [PATCH 16/22] Add new menu links and recategorize existing entries. --- pages/helpers/menu.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index d3c8b87..5082860 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -38,18 +38,23 @@

    Main : Home - Apps About Contact Support | Media : - Apps + Git + Books Videos Photos - Recipes - Poetry + Guides -- 2.49.1 From f5251c89f9b947a4ee6b3713e0109432610ecf33 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 21 Nov 2025 08:53:33 -0700 Subject: [PATCH 17/22] Turn off advisory. --- pages/helpers/advisory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/helpers/advisory.php b/pages/helpers/advisory.php index 8726f84..9fa2c56 100755 --- a/pages/helpers/advisory.php +++ b/pages/helpers/advisory.php @@ -1,6 +1,6 @@ #!/usr/bin/php

    -- 2.49.1 From 18db97629ff140796fe09a3122d32e22eb2c2454 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 21 Nov 2025 15:40:07 -0700 Subject: [PATCH 18/22] Remove extra trailing slash. --- pages/helpers/menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index 5082860..0edd672 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -51,7 +51,7 @@ target="_blank" rel="noopener noreferrer">Videos Photos | Blog: - Recipes Poetry -- 2.49.1 From 2dcdfc745ab13ae9abe6b94e60fd8d8c2216e929 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sat, 22 Nov 2025 10:30:49 -0700 Subject: [PATCH 19/22] Use the blog subdomain for more blog-ish content. --- pages/helpers/menu.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/helpers/menu.php b/pages/helpers/menu.php index 0edd672..6839334 100755 --- a/pages/helpers/menu.php +++ b/pages/helpers/menu.php @@ -53,8 +53,8 @@ | Blog: Recipes - Poetry - Guides -- 2.49.1 From cae8acda2723fb0524ebc58d9144d959141bc0e4 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 1 Dec 2025 08:26:45 -0700 Subject: [PATCH 20/22] Lazy load image content. Improves performance for casual viewing. --- pages/photos.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/photos.sh b/pages/photos.sh index 8cd0222..08a310a 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -146,14 +146,14 @@ function build_album_pages { echo -en "\t\t\t\t<$a href='/$photo'>" >> $subpage # Determine what type of media it is, and how to display it. if [[ $photo == *".mp4" ]]; then - echo -e "\t\t\t\t\t