From 5cbe5372ea0ab6debfeaddeb8cec0ca1ffdbefa8 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Thu, 9 Oct 2025 13:56:52 -0700 Subject: [PATCH 01/75] Add link to Obtainium configuration. --- pages/subpages/home/apps.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pages/subpages/home/apps.php b/pages/subpages/home/apps.php index 4b5b0b1..fad83b8 100755 --- a/pages/subpages/home/apps.php +++ b/pages/subpages/home/apps.php @@ -226,6 +226,15 @@

Otherwise, "Take first link" works with pseudo versions.

+

+ This JSON file will handle it all for you: +

+ -- 2.49.1 From 3429ffc4f664d9dac95969dce997e45c9708e9be Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 07:11:09 -0700 Subject: [PATCH 14/75] Add note on why Confused section of Obtainum config is commented. --- pages/apps.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/apps.php b/pages/apps.php index 8747e28..8f6bbeb 100755 --- a/pages/apps.php +++ b/pages/apps.php @@ -74,6 +74,8 @@
  • Home
  • About
  • Contact
  • Support
    • - -- 2.49.1 From 692b6523a16416bfc144d16a5bc4bdb8f0af94d9 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 14:43:15 -0700 Subject: [PATCH 16/75] Change from "Latest" to "All" announcements. --- pages/subpages/home/announcements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index f5b41e0..2910cf2 100644 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -4,7 +4,7 @@ ?>
    -

    Latest Announcements

    +

    All Announcements

    -- 2.49.1 From 41dd1719ac4b7723911e5cbafaa3f491632f7a5e Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:06:55 -0700 Subject: [PATCH 17/75] Add ability to have images surround the banner. --- pages/helpers/banner.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index e3855e0..11adc7d 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -1,8 +1,27 @@ #!/usr/bin/php + -
    + + <<banner01.jpg>> +
    + ';?> +
    header">
    + + <<banner02.jpg>> +
    + ';?> -- 2.49.1 From 63da008d4173ec60ef6e314d59aedab7acba0957 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:07:30 -0700 Subject: [PATCH 18/75] Remove the hardcoded height of the banner. --- pages/helpers/banner.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/helpers/banner.css b/pages/helpers/banner.css index fac7577..85fd73f 100644 --- a/pages/helpers/banner.css +++ b/pages/helpers/banner.css @@ -4,7 +4,7 @@ .banner-top, .banner-middle, .banner-bottom { color: white; width: 100%; - height: 69px; + /* height: 69px; TBD/TODO: Still testing this removal. */ font-size: 50px; text-align: center; } -- 2.49.1 From 3053b941d7e13c41816c6ad2740b8e9e096fea71 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:08:47 -0700 Subject: [PATCH 19/75] Change mode of new announcements file. --- pages/subpages/home/announcements.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 pages/subpages/home/announcements.php diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php old mode 100644 new mode 100755 -- 2.49.1 From a8b60b56625ad74f8bb6be76b48be0cdd6b98342 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:10:59 -0700 Subject: [PATCH 20/75] Set the banner pics to true for a while. --- pages/helpers/banner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 11adc7d..adc861d 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -1,7 +1,7 @@ #!/usr/bin/php -- 2.49.1 From 1cec38a99ee7db01ca182ca76a051c0f9064ff56 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:11:54 -0700 Subject: [PATCH 21/75] Remove extra newline. --- pages/subpages/home/announcements.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index 2910cf2..99a5c51 100755 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -2,7 +2,6 @@ -

    All Announcements

    -- 2.49.1 From c479aa5b73b6e5e5aaa876c709a10d9164334b8c Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:18:02 -0700 Subject: [PATCH 22/75] Use a global variable for whether the banner images are being shown. --- pages/helpers/banner.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index adc861d..3e79f69 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -1,7 +1,10 @@ #!/usr/bin/php     -- 2.49.1 From 24af65bfeb878a96c241cf15f2a9ce6fbc919c56 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:18:48 -0700 Subject: [PATCH 23/75] Use the global variable to determine whether page title images are shown. No if images are in the banner. Yes if the banner is only the logo. --- pages/about.php | 4 ++++ pages/contact.php | 4 ++++ pages/home.php | 4 ++++ pages/support.php | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/pages/about.php b/pages/about.php index 4bd3f3f..93c45d6 100755 --- a/pages/about.php +++ b/pages/about.php @@ -8,9 +8,13 @@

    Who Am I?

    + <<about.jpg>>
    + ';?>
    diff --git a/pages/contact.php b/pages/contact.php index 15c4bd0..011c773 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -8,9 +8,13 @@

    Contact

    + <<contact.jpg>>
    + ';?>
    diff --git a/pages/home.php b/pages/home.php index 2730784..ecff4eb 100755 --- a/pages/home.php +++ b/pages/home.php @@ -11,9 +11,13 @@

    Welcome!

    + <<home.jpg>>
    + ';?>
    diff --git a/pages/support.php b/pages/support.php index a9bd4b5..9dc30b9 100755 --- a/pages/support.php +++ b/pages/support.php @@ -11,9 +11,13 @@

    Support

    + <<support.jpg>>
    + ';?>

    Anything is very much appreciated!! Thank you for considering me! -- 2.49.1 From c6289be09c4a308a5f38b22014771a25abce7f21 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:21:28 -0700 Subject: [PATCH 24/75] Found another page with a title photo. Disable if banner photos are on. --- pages/media.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/media.php b/pages/media.php index c50ec44..2ccca6e 100755 --- a/pages/media.php +++ b/pages/media.php @@ -11,9 +11,13 @@

    Media

    + <<videos.jpg>>
    + ';?>
    -- 2.49.1 From 8f24d80e8d46a3438ebd57863694f4d97b290515 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:22:07 -0700 Subject: [PATCH 25/75] Add variable to control whether the advisory is shown so that it can easily be toggled. Helps during testing! --- pages/helpers/advisory.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/helpers/advisory.php b/pages/helpers/advisory.php index 3b1499e..8abf014 100755 --- a/pages/helpers/advisory.php +++ b/pages/helpers/advisory.php @@ -1,4 +1,7 @@ #!/usr/bin/php +

    @@ -16,3 +19,5 @@
    + '; +?> -- 2.49.1 From 46e357d2bbb490325059902e3884160316937687 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:23:44 -0700 Subject: [PATCH 26/75] Hide media photo even if banner does not have photos. --- pages/media.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/media.php b/pages/media.php index 2ccca6e..9bdc661 100755 --- a/pages/media.php +++ b/pages/media.php @@ -11,13 +11,13 @@

    Media

    - <<videos.jpg>>
    - ';?> + ';?>-->
    -- 2.49.1 From 825bf62851f6032313e8a4b0bf0b6186b778909c Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:25:02 -0700 Subject: [PATCH 27/75] Change wording about offline time. --- pages/contact.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/contact.php b/pages/contact.php index 011c773..1b4e67f 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -19,8 +19,8 @@

    - Timely responses are not guarenteed, as I spend a majority of - my time offline and enjoy traveling in reception-free zones. + Timely responses are not guarenteed, as I spend a large amount of + time offline and enjoy traveling in reception-free zones.

    -- 2.49.1 From 0d3822258f12c934ac9638e95a646e0a417ccd47 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:34:27 -0700 Subject: [PATCH 28/75] Change intro text to consistently use `header` class as the background color. --- pages/about.php | 2 +- pages/apps.php | 2 +- pages/contact.php | 6 +++++- pages/home.php | 2 +- pages/media.php | 2 +- pages/photos.sh | 2 +- pages/support.php | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pages/about.php b/pages/about.php index 93c45d6..966edf2 100755 --- a/pages/about.php +++ b/pages/about.php @@ -17,7 +17,7 @@ ';?>
    -
    +

    Hi there! My name is Chad, I'm the primary content creator behind Hyperling and HyperVegan. Thank you for your interest! diff --git a/pages/apps.php b/pages/apps.php index 8f6bbeb..321309b 100755 --- a/pages/apps.php +++ b/pages/apps.php @@ -14,7 +14,7 @@

    -
    +

    I'm a professional software engineer who's been playing with Linux system administration from a young age. diff --git a/pages/contact.php b/pages/contact.php index 1b4e67f..9f64bdd 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -17,13 +17,17 @@ ';?>

    -
    +

    Timely responses are not guarenteed, as I spend a large amount of time offline and enjoy traveling in reception-free zones.

    + +
    +

    Methods

    +

    diff --git a/pages/home.php b/pages/home.php index ecff4eb..6afcb10 100755 --- a/pages/home.php +++ b/pages/home.php @@ -20,7 +20,7 @@ ';?>

    -
    +

    Thank you for visiting my site! My goal is to make the world a better place. Hopefully you find content here which helps empower diff --git a/pages/media.php b/pages/media.php index 9bdc661..11f1f2f 100755 --- a/pages/media.php +++ b/pages/media.php @@ -20,7 +20,7 @@ ';?>-->

    -
    +

    My written works, social platforms, and photos can be found here.

    diff --git a/pages/photos.sh b/pages/photos.sh index 6e87a93..8cd0222 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -41,7 +41,7 @@ function start_main_page { echo -e "\t\t
    " >> $mainpage echo -e "\t\t
    " >> $mainpage - echo -e "\t\t\t
    " >> $mainpage + echo -e "\t\t\t
    " >> $mainpage echo -en "\t\t\t\t

    You may click on an album name to " >> $mainpage echo -en "view all of its files, or click on a specific image to bring up the " >> $mainpage echo -en "full resolution. On the album pages you may also click an image or " >> $mainpage diff --git a/pages/support.php b/pages/support.php index 9dc30b9..5776512 100755 --- a/pages/support.php +++ b/pages/support.php @@ -18,7 +18,7 @@ <<support.jpg>>

    ';?> -
    +

    Anything is very much appreciated!! Thank you for considering me!

    -- 2.49.1 From 3273fb62c80397ee94cce770f8f2efe4cb6864fc Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 13 Oct 2025 15:37:52 -0700 Subject: [PATCH 29/75] Remove extra newlines around PHP tags. --- pages/about.php | 2 -- pages/apps.php | 2 -- pages/contact.php | 2 -- pages/diet.php | 2 -- pages/freedom.php | 2 -- pages/health.php | 2 -- pages/helpers/body_close.php | 1 - pages/helpers/body_open.php | 2 -- pages/home.php | 2 -- pages/media.php | 2 -- pages/resources.php | 2 -- pages/resume.php | 2 -- pages/subpages/home/announcements.php | 8 -------- pages/support.php | 2 -- 14 files changed, 33 deletions(-) diff --git a/pages/about.php b/pages/about.php index 966edf2..7a86d85 100755 --- a/pages/about.php +++ b/pages/about.php @@ -5,7 +5,6 @@ } include "helpers/body_open.php"; ?> -

    Who Am I?

    - -

    My Profession

    @@ -287,7 +286,6 @@

    - diff --git a/pages/contact.php b/pages/contact.php index 9f64bdd..1317650 100755 --- a/pages/contact.php +++ b/pages/contact.php @@ -5,7 +5,6 @@ } include "helpers/body_open.php"; ?> -

    Contact

    - diff --git a/pages/diet.php b/pages/diet.php index c474611..4820693 100755 --- a/pages/diet.php +++ b/pages/diet.php @@ -5,7 +5,6 @@ } include "helpers/body_open.php"; ?> -

    Current Diet

    @@ -208,7 +207,6 @@
    - diff --git a/pages/freedom.php b/pages/freedom.php index 4dd96af..df48706 100755 --- a/pages/freedom.php +++ b/pages/freedom.php @@ -9,7 +9,6 @@ } include "helpers/body_open.php"; ?> -

    Voluntary Sovereignty

    @@ -68,7 +67,6 @@
    - diff --git a/pages/health.php b/pages/health.php index 1b7bd41..65694b0 100755 --- a/pages/health.php +++ b/pages/health.php @@ -9,7 +9,6 @@ } include "helpers/body_open.php"; ?> -

    My Health Protocol

    @@ -109,7 +108,6 @@
    - diff --git a/pages/helpers/body_close.php b/pages/helpers/body_close.php index d88d9ce..0f97e80 100755 --- a/pages/helpers/body_close.php +++ b/pages/helpers/body_close.php @@ -2,6 +2,5 @@ - diff --git a/pages/helpers/body_open.php b/pages/helpers/body_open.php index 68e3a98..d2a52cb 100755 --- a/pages/helpers/body_open.php +++ b/pages/helpers/body_open.php @@ -2,9 +2,7 @@ - - -

    Welcome!

    - -

    Media

    - diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index 99a5c51..fc22135 100755 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -13,7 +13,6 @@ I wrote another short free eBook, "Voluntary Sovereignty", check it out here!

    - It discusses how to live in order to create a truly free society, @@ -24,7 +23,6 @@ order followers while living how you were meant to be on the Earth.

    ";?> -

    "Expense Tracker" has been completed!

    - It allows for tracking recurring expenses against income and static assets, @@ -51,7 +48,6 @@ This is my first app developed using the Flutter framework.

    ";?> -

    here!

    - It contains a summary of my favorite and most useful lifestyle advice. @@ -81,7 +76,6 @@ Reverse chronic disease and live your life full of energy and abundance!

    ";?> -

    Tic-Tac-Toe!

    - This was written to learn Kotlin style Android programming. @@ -107,7 +100,6 @@ as well as a local human player!

    ";?> -

    -

    Support

    - Date: Tue, 14 Oct 2025 06:00:26 -0700 Subject: [PATCH 30/75] Get the banner images to play MUCH better thanks to midnight epiphany of using `background`. :) --- pages/helpers/banner.css | 14 +++++++++++++- pages/helpers/banner.php | 25 ++++++++++++++++--------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/pages/helpers/banner.css b/pages/helpers/banner.css index 85fd73f..42b1b73 100644 --- a/pages/helpers/banner.css +++ b/pages/helpers/banner.css @@ -4,7 +4,7 @@ .banner-top, .banner-middle, .banner-bottom { color: white; width: 100%; - /* height: 69px; TBD/TODO: Still testing this removal. */ + height: 69px; font-size: 50px; text-align: center; } @@ -21,3 +21,15 @@ .banner-bottom { background-color: #33CC33; } + + .banner-image { + background-position: center, center; + background-repeat: no-repeat; + height: 237px; /* 69*3[banner] + 15*2[padding] */ + } + .banner-image01 { + background-image: url("/files/media/icons/home.jpg"); + } + .banner-image02 { + background-image: url("/files/media/icons/contact.jpg"); + } diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 3e79f69..5833a67 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -6,25 +6,32 @@ } $show_pics = $GLOBALS["SHOW_BANNER_PICS"]; $banner_width = $show_pics ? 6 : 12; + + // TBD / TODO: + // Check if user has vertical screen? + // Is that possible in this environment? + //$image_width = $vertical_screen ? 6 : 3; ?> +
    - <<banner01.jpg>> + ';?> -
    header"> +
    header">
    - <<banner02.jpg>> + ';?> +
    -- 2.49.1 From c2193c9651516ac67a79089cc5d0e4319d2f9deb Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:30:03 -0700 Subject: [PATCH 31/75] Refactor banner image CSS. --- pages/helpers/banner.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/helpers/banner.css b/pages/helpers/banner.css index 42b1b73..6ea6add 100644 --- a/pages/helpers/banner.css +++ b/pages/helpers/banner.css @@ -23,9 +23,10 @@ } .banner-image { - background-position: center, center; background-repeat: no-repeat; - height: 237px; /* 69*3[banner] + 15*2[padding] */ + + background-position: center, center; + height: 237px; /* 69*3[banner stripes] + 15*2[padding top+bot] */ } .banner-image01 { background-image: url("/files/media/icons/home.jpg"); -- 2.49.1 From 15bbb2e33efc80337696879dc8215917fe9aa6ea Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:30:24 -0700 Subject: [PATCH 32/75] Add links to announcement videos. --- pages/subpages/home/announcements.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index fc22135..d85d5e6 100755 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -24,9 +24,9 @@

    ";?>

    - Watch the announcement here | (TBD/TODO) + >Watch the announcement here | (HyperVegan: "Announcements: Skipped Midfest, Voluntary Sovereignty eBook, CheapRVLiving Interview")

    @@ -49,9 +49,9 @@

    ";?>

    - Watch the announcement here | (TBD/TODO) + >Watch the announcement here | (HyperVegan: "Expense Tracker App")

    @@ -77,9 +77,9 @@

    ";?>

    - Watch the announcement here | (TBD/TODO) + >Watch the announcement here | (HyperVegan: "My Health Protocol | eBook")

    @@ -101,9 +101,9 @@

    ";?>

    - Watch the announcement here | (TBD/TODO) + >Watch the announcement here | (HyperVegan: "New Year, New App")

    -- 2.49.1 From 3a736dec82bdeb05dc3819ac995f22f7e7f69dda Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:32:54 -0700 Subject: [PATCH 33/75] Remove TBD. --- pages/about.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/about.php b/pages/about.php index 7a86d85..ee7c102 100755 --- a/pages/about.php +++ b/pages/about.php @@ -29,7 +29,6 @@ planted at least one fruit tree or had a small square foot garden. We would be in paradise!

    -

    Coding and videos aren't my only hobbies, I'm also big into health. I see it as humanity's most important asset and take a -- 2.49.1 From 550485093c99310db3aaca5db69764d7884031aa Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:33:04 -0700 Subject: [PATCH 34/75] Remove TBD. --- pages/apps.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/apps.php b/pages/apps.php index c142477..fac295e 100755 --- a/pages/apps.php +++ b/pages/apps.php @@ -11,7 +11,6 @@

    My Profession

    -

    -- 2.49.1 From 9afec8074265c75c0cb3d1fac7e4af63c96732b7 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:33:18 -0700 Subject: [PATCH 35/75] Remove title image. --- pages/diet.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/diet.php b/pages/diet.php index 4820693..93e0a24 100755 --- a/pages/diet.php +++ b/pages/diet.php @@ -7,9 +7,6 @@ ?>

    Current Diet

    -
    - Image TBD -
    -- 2.49.1 From 999a919a7fdccb518c87aaaa0f4c28acd0888383 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:33:27 -0700 Subject: [PATCH 36/75] Remove title image. --- pages/resume.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/pages/resume.php b/pages/resume.php index fe9aeb4..2483523 100755 --- a/pages/resume.php +++ b/pages/resume.php @@ -10,9 +10,6 @@ ?>

    Resume

    -
    - <<home.jpg>> -

    Current Status : Traveling Full Time

    -- 2.49.1 From a5b6227fef4ea73191d16b65ac842fdd52eab7ce Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 06:37:14 -0700 Subject: [PATCH 37/75] Remove indentation on centered link. Remove comment with Markdown link. --- pages/resume.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pages/resume.php b/pages/resume.php index 2483523..5643697 100755 --- a/pages/resume.php +++ b/pages/resume.php @@ -17,22 +17,13 @@

    Interested in hiring me? View my resume below!

    - - +
    Date: Tue, 14 Oct 2025 06:39:28 -0700 Subject: [PATCH 38/75] Place subtitle header in its own row. --- pages/resume.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/resume.php b/pages/resume.php index 5643697..4065887 100755 --- a/pages/resume.php +++ b/pages/resume.php @@ -10,6 +10,8 @@ ?>

    Resume

    +
    +

    Current Status : Traveling Full Time

    -- 2.49.1 From 730940b0039e36535ce1effb9b1b7f25a6f7113b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 09:58:35 -0700 Subject: [PATCH 39/75] Remove `All`, seems too wordy. --- pages/subpages/home/announcements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index d85d5e6..6156a1f 100755 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -3,7 +3,7 @@ $long = true; ?>
    -

    All Announcements

    +

    Announcements

    -- 2.49.1 From fa8eef51ff67d3b94e9e57f66abc3db2ede034e0 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 10:12:27 -0700 Subject: [PATCH 40/75] Reword and refactor advisory. --- pages/helpers/advisory.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pages/helpers/advisory.php b/pages/helpers/advisory.php index 8abf014..e349a49 100755 --- a/pages/helpers/advisory.php +++ b/pages/helpers/advisory.php @@ -1,15 +1,13 @@ #!/usr/bin/php

    -
    -
    -

    Announcements

     -
    + -- 2.49.1 From c28f7a92d95e35b1ba68575f8bea7000fad86a76 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 10:19:02 -0700 Subject: [PATCH 43/75] Break open HTML so it is more readable. Add comment for gap. --- pages/media.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pages/media.php b/pages/media.php index de46cbc..1685700 100755 --- a/pages/media.php +++ b/pages/media.php @@ -35,14 +35,18 @@

    I enjoy writing! Find my free eBooks below.

    -
    • - 2025-09-28: Voluntary Sovereignty | - Existing in a statist society with the least amount of friction. -

    • - 2024-03-07: Hyperling's Health Protocol | - Health is a lifestyle, not a diet. Align yourself with Nature - to receive its blessings. -
    +
      +
    • + 2025-09-28: Voluntary Sovereignty | + Existing in a statist society with the least amount of friction. +
      • +

      • +
    • + 2024-03-07: Hyperling's Health Protocol | + Health is a lifestyle, not a diet. Align yourself with Nature + to receive its blessings. +
      • +
    -- 2.49.1 From 0ec47180e24c6abfc804d932bd2b8ea627e58281 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 10:30:08 -0700 Subject: [PATCH 44/75] Add part about testing. --- pages/apps.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/apps.php b/pages/apps.php index fac295e..09e2e54 100755 --- a/pages/apps.php +++ b/pages/apps.php @@ -18,9 +18,9 @@ Linux system administration from a young age. Much of my career has focused on back-end / database systems and optimizing workflows. - I feel that I specialize in building systems with "no sharp edges", - meaning that I make sure there isn't a way the user can hurt - themselves or the system. + I feel that I specialize in building systems with "no sharp + edges", meaning that I test rigorously to ensure there aren't any + ways the user can hurt themselves or the system. In my free time I enjoy learning new languages and writing apps for Android.

    -- 2.49.1 From 8207702442ab1ddae3908062264889cdb1d0d81d Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 10:30:22 -0700 Subject: [PATCH 45/75] Make the dates pop a bit more. --- pages/subpages/home/announcements.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/subpages/home/announcements.php b/pages/subpages/home/announcements.php index 6156a1f..eef9ce4 100755 --- a/pages/subpages/home/announcements.php +++ b/pages/subpages/home/announcements.php @@ -8,7 +8,7 @@
    - 2025-09-28 + 2025-09-28

    I wrote another short free eBook, "Voluntary Sovereignty", check it out here! @@ -33,7 +33,7 @@

    - 2025-05-XX + 2025-03-27

    My new Android app "Expense Tracker" @@ -59,7 +59,7 @@

    - 2024-03-07 + 2024-03-07

    Find my free eBook, "Hyperling's Health Protocol", here! @@ -86,7 +86,7 @@

    - 2024-03-31 + 2024-03-31

    There's a new app in town, Tic-Tac-Toe! -- 2.49.1 From 8507cbd1897745e1a230755e274bc07eceb1f0a7 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:18:39 -0700 Subject: [PATCH 46/75] Add dedicated cronjob file for keeping the project in sync on docker containers. --- cronjob.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 cronjob.sh diff --git a/cronjob.sh b/cronjob.sh new file mode 100755 index 0000000..13e75a7 --- /dev/null +++ b/cronjob.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# 2025-10-14 Hyperling +# Copied cronjob.sh from env-docker/Config/Hugo-Example/files/ to use for this +# project so that docker container can do periodic git pulls rather than having +# to reload /rebuild the container each time a release is pushed out. + +DIR="$(dirname -- "${BASH_SOURCE[0]}")" +PROG="$(basename -- "${BASH_SOURCE[0]}")" +echo "$DIR/$PROG" +cd $DIR + +echo "*** Running cronjob @ `date` ***" + +# Pull any updates, and if the project is already up to date, exit successfully. +git pull | grep -v "up to date" +status="$?" +echo "* Pull status is '$status'." +if [[ $status != 0 ]]; then + echo "* Site is already up to date, exiting." + exit 0 +fi + +exit 0 -- 2.49.1 From 3fcd6af3a91a2fc082e9a337483613c4836a96ca Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:24:14 -0700 Subject: [PATCH 47/75] Move cd to be more in the program. --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index 13e75a7..0fa42c5 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -7,9 +7,9 @@ DIR="$(dirname -- "${BASH_SOURCE[0]}")" PROG="$(basename -- "${BASH_SOURCE[0]}")" echo "$DIR/$PROG" -cd $DIR echo "*** Running cronjob @ `date` ***" +cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. git pull | grep -v "up to date" -- 2.49.1 From ed7c2b8b297d7228e80c156443a827f2dceb2bf1 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:25:35 -0700 Subject: [PATCH 48/75] Add automatic execution of cronjob through run script. --- run.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index e3a29c9..caf873f 100755 --- a/run.sh +++ b/run.sh @@ -4,8 +4,9 @@ ## Setup ## -DIR=`dirname $0` -PROG=`basename $0` +DIR="$(dirname -- "${BASH_SOURCE[0]}")" +PROG="$(basename -- "${BASH_SOURCE[0]}")" +echo "$DIR/$PROG" ## Functions ## @@ -120,11 +121,20 @@ find files/photos/ -name "*".html -print -delete ## Main ## +log "Start repo updater" +while true; do + $DIR/cronjob.sh + sleep 30 +done & + log "Start website API." node ./main.js $ports status=$? ## Finish ## +log "Kill spawned processes." +pkill -P $$ + log "Exiting with status '$status'." exit $status -- 2.49.1 From 6def1a300765136cd675f52b28a8fec599e86d3b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:26:43 -0700 Subject: [PATCH 49/75] Echo the killed processes. --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index caf873f..5bfed1c 100755 --- a/run.sh +++ b/run.sh @@ -134,7 +134,7 @@ status=$? ## Finish ## log "Kill spawned processes." -pkill -P $$ +pkill -eP $$ log "Exiting with status '$status'." exit $status -- 2.49.1 From 1fa30724d25384318b785aafe83b8659b887b672 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:43:03 -0700 Subject: [PATCH 50/75] Use a parent process checker for both forked jobs. --- run.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 5bfed1c..4d25526 100755 --- a/run.sh +++ b/run.sh @@ -27,6 +27,20 @@ function log { echo -e "`date` - $message" } +function check_main { + if [[ -z "$1" ]]; then + echo "ERROR: Subprocess name was not provided. $1" + exit 0 + fi + log "Subprocess '$1' checking if main process is still running..." + ps $$ + status=$? + if [[ $status != 0 ]]; then + log "Process '$$' not found, '$1' from '$DIR/$PROG' exiting." + exit 0 + fi +} + ## Parameters ## while getopts ':p:h' opt; do @@ -96,6 +110,7 @@ npm install log "Removing old index files." find files/photos/ -name "*".html -print -delete { + check_main photos count=1 http_code=0 port="${ports%% *}" @@ -121,8 +136,9 @@ find files/photos/ -name "*".html -print -delete ## Main ## -log "Start repo updater" +log "Start repo updater." while true; do + check_main cronjob $DIR/cronjob.sh sleep 30 done & -- 2.49.1 From 45915d29142229c4cfb8358b49eca5b8be1b6b5a Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:48:55 -0700 Subject: [PATCH 51/75] Add comment on how to stop the --- cronjob.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cronjob.sh b/cronjob.sh index 0fa42c5..7ce5b14 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -18,6 +18,9 @@ echo "* Pull status is '$status'." if [[ $status != 0 ]]; then echo "* Site is already up to date, exiting." exit 0 +#else +# # Kill node.js which will complete run.sh and restart any Docker containers. +# pkill node fi exit 0 -- 2.49.1 From b734be405483661a1be7376b98845a53c6259bf3 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:50:50 -0700 Subject: [PATCH 52/75] Enable kill mode. --- cronjob.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 7ce5b14..79c880f 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -18,9 +18,9 @@ echo "* Pull status is '$status'." if [[ $status != 0 ]]; then echo "* Site is already up to date, exiting." exit 0 -#else -# # Kill node.js which will complete run.sh and restart any Docker containers. -# pkill node +else + # Kill node.js which will complete run.sh and restart any Docker containers. + pkill node fi exit 0 -- 2.49.1 From cba46bfc23cd0b2ac244dcef4587e6ca3e2f4f09 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:51:19 -0700 Subject: [PATCH 53/75] Add explicit rebase. --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index 79c880f..f2efbd9 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -12,7 +12,7 @@ echo "*** Running cronjob @ `date` ***" cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. -git pull | grep -v "up to date" +git pull --rebase | grep -v "up to date" status="$?" echo "* Pull status is '$status'." if [[ $status != 0 ]]; then -- 2.49.1 From f212c417348a5a0c10b2764bc20d78c86669a53a Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:53:13 -0700 Subject: [PATCH 54/75] Add `ps` requirement, missing from Docker container! --- run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/run.sh b/run.sh index 4d25526..72a66fe 100755 --- a/run.sh +++ b/run.sh @@ -91,6 +91,10 @@ if [[ ! `which curl` ]]; then echo "- Installing Curl" $sudo apt-get install -y curl fi +if [[ ! `which ps` ]]; then + echo "- Installing PS" + $sudo apt-get install -y ps +fi # Directories and allowed page types are executable, others are not. log "Fix any strange file permissions." -- 2.49.1 From 749a018a6e65b4afc54b7eedf37fa4b9323f815f Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:16:59 -0700 Subject: [PATCH 55/75] Remove rebase since files/ is being ignored in Docker container. --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index f2efbd9..79c880f 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -12,7 +12,7 @@ echo "*** Running cronjob @ `date` ***" cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. -git pull --rebase | grep -v "up to date" +git pull | grep -v "up to date" status="$?" echo "* Pull status is '$status'." if [[ $status != 0 ]]; then -- 2.49.1 From 5306cb78d3a2fd5eee2083cea21e7a846f758028 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:17:17 -0700 Subject: [PATCH 56/75] Change to the proper package name for `ps`. --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 72a66fe..ad26795 100755 --- a/run.sh +++ b/run.sh @@ -93,7 +93,7 @@ if [[ ! `which curl` ]]; then fi if [[ ! `which ps` ]]; then echo "- Installing PS" - $sudo apt-get install -y ps + $sudo apt-get install -y procps fi # Directories and allowed page types are executable, others are not. -- 2.49.1 From 5a6d91296dd83ad2c1415a84cfc66ebf509813f9 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:23:28 -0700 Subject: [PATCH 57/75] Change label for local cronjob. --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index ad26795..4695f7a 100755 --- a/run.sh +++ b/run.sh @@ -140,7 +140,7 @@ find files/photos/ -name "*".html -print -delete ## Main ## -log "Start repo updater." +log "Start local cronjob." while true; do check_main cronjob $DIR/cronjob.sh -- 2.49.1 From 51b2ebf8e62634570af9e081247d0fd4189e730f Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:36:57 -0700 Subject: [PATCH 58/75] Do not do a full kill, allows website to keep uptime while getting updates. --- cronjob.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 79c880f..05eee13 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -8,6 +8,14 @@ DIR="$(dirname -- "${BASH_SOURCE[0]}")" PROG="$(basename -- "${BASH_SOURCE[0]}")" echo "$DIR/$PROG" +function reload-project { + # Do not kill program, just use the new files and if run.sh or main.js were + # changed then they can get reloaded manually or by the nightly backup. + echo "Done!" + ## Kill node.js which will complete run.sh and restart any Docker containers. + #pkill node +} + echo "*** Running cronjob @ `date` ***" cd $DIR @@ -19,8 +27,7 @@ if [[ $status != 0 ]]; then echo "* Site is already up to date, exiting." exit 0 else - # Kill node.js which will complete run.sh and restart any Docker containers. - pkill node + reload-project fi exit 0 -- 2.49.1 From f57583b1a9342fc5bfb443958877ec03d42461c6 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:46:57 -0700 Subject: [PATCH 59/75] Refactor comments and output. --- cronjob.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 05eee13..1731b83 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -9,11 +9,11 @@ PROG="$(basename -- "${BASH_SOURCE[0]}")" echo "$DIR/$PROG" function reload-project { + ## Kill node.js which will complete run.sh and restart any Docker containers. + #pkill node # Do not kill program, just use the new files and if run.sh or main.js were # changed then they can get reloaded manually or by the nightly backup. echo "Done!" - ## Kill node.js which will complete run.sh and restart any Docker containers. - #pkill node } echo "*** Running cronjob @ `date` ***" -- 2.49.1 From 645093da361c5259b74389779c0e31ae1637b8d7 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 12:48:39 -0700 Subject: [PATCH 60/75] Add the announcement video to Freedom page. --- pages/freedom.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pages/freedom.php b/pages/freedom.php index df48706..b69bd36 100755 --- a/pages/freedom.php +++ b/pages/freedom.php @@ -65,6 +65,19 @@ [CODE] | Source Code + + +

    + Here is its announcement video: +

    +
    Date: Tue, 14 Oct 2025 12:51:06 -0700 Subject: [PATCH 61/75] Change announcement wording. Refactor code HTML. --- pages/freedom.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pages/freedom.php b/pages/freedom.php index b69bd36..58e5c2e 100755 --- a/pages/freedom.php +++ b/pages/freedom.php @@ -58,26 +58,28 @@

    Curious how I made it? Check out its Git repository:

    - - +

    - Here is its announcement video: + Here is the video it was announced in:

    Date: Tue, 14 Oct 2025 12:52:07 -0700 Subject: [PATCH 62/75] Use a single echo command to announce the program's run. --- cronjob.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 1731b83..e1b2c9e 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -6,17 +6,16 @@ DIR="$(dirname -- "${BASH_SOURCE[0]}")" PROG="$(basename -- "${BASH_SOURCE[0]}")" -echo "$DIR/$PROG" function reload-project { ## Kill node.js which will complete run.sh and restart any Docker containers. #pkill node # Do not kill program, just use the new files and if run.sh or main.js were # changed then they can get reloaded manually or by the nightly backup. - echo "Done!" + echo "Project reloaded successfully!" } -echo "*** Running cronjob @ `date` ***" +echo "*** Running '$DIR/$PROG' @ `date` ***" cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. -- 2.49.1 From fa0e9907ee467dd6d58d401637f51e8e1d97b0f2 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:06:11 -0700 Subject: [PATCH 63/75] Use full executable path. Move the `ps` information out of the loop to prevent log spam. --- run.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/run.sh b/run.sh index 4695f7a..62219d9 100755 --- a/run.sh +++ b/run.sh @@ -6,7 +6,12 @@ DIR="$(dirname -- "${BASH_SOURCE[0]}")" PROG="$(basename -- "${BASH_SOURCE[0]}")" -echo "$DIR/$PROG" + +# Ensure we are executing from this file's directory. +cd $DIR +DIR="`pwd`" +NAME="'$DIR/$PROG'" +echo $NAME ## Functions ## @@ -27,13 +32,15 @@ function log { echo -e "`date` - $message" } +log "Local process information:" +ps $$ function check_main { if [[ -z "$1" ]]; then echo "ERROR: Subprocess name was not provided. $1" exit 0 fi log "Subprocess '$1' checking if main process is still running..." - ps $$ + ps $$ >/dev/null status=$? if [[ $status != 0 ]]; then log "Process '$$' not found, '$1' from '$DIR/$PROG' exiting." @@ -62,9 +69,6 @@ fi ## Build Environment ## -# Ensure we are executing from this file's directory. -cd $DIR - sudo="" if [[ -z $LOGNAME ]]; then LOGNAME="`whoami`" -- 2.49.1 From 2a915fec69a3a15d80cc75b8f1750f15e4168b96 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:06:21 -0700 Subject: [PATCH 64/75] Fancify script. --- cronjob.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index e1b2c9e..d94fbad 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -4,26 +4,37 @@ # project so that docker container can do periodic git pulls rather than having # to reload /rebuild the container each time a release is pushed out. +## Setup ## + DIR="$(dirname -- "${BASH_SOURCE[0]}")" PROG="$(basename -- "${BASH_SOURCE[0]}")" +cd $DIR +DIR="`pwd`" +NAME="'$PROG'" + +function log { + echo -e "`date` : $NAME - $1" +} function reload-project { ## Kill node.js which will complete run.sh and restart any Docker containers. #pkill node # Do not kill program, just use the new files and if run.sh or main.js were # changed then they can get reloaded manually or by the nightly backup. - echo "Project reloaded successfully!" + log "Project reloaded successfully!" } -echo "*** Running '$DIR/$PROG' @ `date` ***" +## Main ## + +log "Checking for updates..." cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. git pull | grep -v "up to date" status="$?" -echo "* Pull status is '$status'." +log "Pull status is '$status'." if [[ $status != 0 ]]; then - echo "* Site is already up to date, exiting." + log "Site is already up to date, exiting." exit 0 else reload-project -- 2.49.1 From 7379df38dec638381c5b664d1202efb505fac5db Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:11:37 -0700 Subject: [PATCH 65/75] Make output even more succint. Remove duplicate cd command. --- cronjob.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index d94fbad..50ffa5d 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -26,9 +26,6 @@ function reload-project { ## Main ## -log "Checking for updates..." -cd $DIR - # Pull any updates, and if the project is already up to date, exit successfully. git pull | grep -v "up to date" status="$?" -- 2.49.1 From 6e3666cea22426e353e3da20af37e1466842c444 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:37:55 -0700 Subject: [PATCH 66/75] Begin watching git's status too, not just the grep status of not already being up to date. Add more conditional branches so that errors are logged properly. --- cronjob.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 50ffa5d..f433471 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -27,14 +27,24 @@ function reload-project { ## Main ## # Pull any updates, and if the project is already up to date, exit successfully. -git pull | grep -v "up to date" -status="$?" -log "Pull status is '$status'." -if [[ $status != 0 ]]; then +output="`git pull`" +git_status="$?" + +echo "$output" | grep -v "up to date" +grep_status="$?" + +log "Pull status is '$git_status', anything but 'up to date' is '$grep_status'." + +if [[ $git_status != 0 ]]; then + log "*** ERROR: Git reported a failure! ***" + exit 1 +elif [[ $git_status == 0 && $grep_status == 0 ]]; then + reload-project +elif [[ $git_status == 0 && $grep_status != 0 ]]; then log "Site is already up to date, exiting." exit 0 else - reload-project + log "*** WARNING: Unknown Situation ***" fi exit 0 -- 2.49.1 From c790dd673653759c82dd810dfb86b32f3303ac8b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:41:46 -0700 Subject: [PATCH 67/75] Reword the output. --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index f433471..3161841 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -33,7 +33,7 @@ git_status="$?" echo "$output" | grep -v "up to date" grep_status="$?" -log "Pull status is '$git_status', anything but 'up to date' is '$grep_status'." +log "Pull status is '$git_status', checking for changes is '$grep_status'." if [[ $git_status != 0 ]]; then log "*** ERROR: Git reported a failure! ***" -- 2.49.1 From e57ec6de50add0993b3933b7fa0f701ea148155c Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:47:38 -0700 Subject: [PATCH 68/75] Add automatic restart if a primary program is updated. --- cronjob.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index 3161841..d82df5e 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -16,11 +16,14 @@ function log { echo -e "`date` : $NAME - $1" } +function kill-project { + # Kill node.js which will complete run.sh and restart any Docker containers. + log "Stopping continuous processes!" + pkill node +} + function reload-project { - ## Kill node.js which will complete run.sh and restart any Docker containers. - #pkill node - # Do not kill program, just use the new files and if run.sh or main.js were - # changed then they can get reloaded manually or by the nightly backup. + # Nothing to do. log "Project reloaded successfully!" } @@ -35,9 +38,17 @@ grep_status="$?" log "Pull status is '$git_status', checking for changes is '$grep_status'." +echo "$output" | grep "main.js" +main_changed="$?" +echo "$output" | grep "run.sh" +run_changed="$?" + if [[ $git_status != 0 ]]; then log "*** ERROR: Git reported a failure! ***" exit 1 +elif [[ $git_status == 0 && ($main_changed == 0 || $run_changed == 0) ]]; then + log "Either main ('$main_changed'), or run ('$run_changed') were changed!" + kill-project elif [[ $git_status == 0 && $grep_status == 0 ]]; then reload-project elif [[ $git_status == 0 && $grep_status != 0 ]]; then -- 2.49.1 From 23c0090a4768f81aa24b27fe19e0f445f5a274e3 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:51:58 -0700 Subject: [PATCH 69/75] Only run apt install command once. --- run.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/run.sh b/run.sh index 62219d9..2ffa7fa 100755 --- a/run.sh +++ b/run.sh @@ -79,25 +79,29 @@ if [[ $LOGNAME != "root" ]]; then fi log "Check if any system dependencies need installed." +progs="" if [[ ! `which php` ]]; then echo "- Installing PHP" - $sudo apt-get install -y php-cli + progs="$progs php-cli" fi if [[ ! `which node` ]]; then echo "- Installing Node" - $sudo apt-get install -y nodejs + progs="$progs nodejs" fi if [[ ! `which npm` ]]; then echo "- Installing NPM" - $sudo apt-get install -y npm + progs="$progs npm" fi if [[ ! `which curl` ]]; then echo "- Installing Curl" - $sudo apt-get install -y curl + progs="$progs curl" fi if [[ ! `which ps` ]]; then echo "- Installing PS" - $sudo apt-get install -y procps + progs="$progs procps" +fi +if [[ -n "$progs" ]]; then + $sudo apt-get install -y $progs fi # Directories and allowed page types are executable, others are not. -- 2.49.1 From 684c237ac1f5a121fe5803f6ee57cc2dd93c4ef4 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 13:57:33 -0700 Subject: [PATCH 70/75] Remove excess exit and provide output var in case it's helpful in later debugging. --- cronjob.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cronjob.sh b/cronjob.sh index d82df5e..2605c9d 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -52,8 +52,7 @@ elif [[ $git_status == 0 && ($main_changed == 0 || $run_changed == 0) ]]; then elif [[ $git_status == 0 && $grep_status == 0 ]]; then reload-project elif [[ $git_status == 0 && $grep_status != 0 ]]; then - log "Site is already up to date, exiting." - exit 0 + log "Nothing to do. '$output'" else log "*** WARNING: Unknown Situation ***" fi -- 2.49.1 From ad83090b05efd35d839fc821df693a0216efa709 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 14:01:08 -0700 Subject: [PATCH 71/75] Add further comments for future self and others. --- cronjob.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cronjob.sh b/cronjob.sh index 2605c9d..3b86879 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -18,6 +18,8 @@ function log { function kill-project { # Kill node.js which will complete run.sh and restart any Docker containers. + # This is more intended towards Development and Stage sites since Production + # will only see git changes when a pull request is manually completed. log "Stopping continuous processes!" pkill node } -- 2.49.1 From cc8a7710a104657fa09c0d8b5b057f699dd5b6e1 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 14:01:52 -0700 Subject: [PATCH 72/75] Enhance comment on WHY there is nothing to do. :) --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index 3b86879..48b505f 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -25,7 +25,7 @@ function kill-project { } function reload-project { - # Nothing to do. + # Nothing to do, run.sh and main.js automatically uses the latest files. log "Project reloaded successfully!" } -- 2.49.1 From d55b13ecbfaed4a47a1419b2f819cc3f2d1bd13e Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 14:03:28 -0700 Subject: [PATCH 73/75] Add more comments. --- cronjob.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cronjob.sh b/cronjob.sh index 48b505f..0d8eb51 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -40,11 +40,13 @@ grep_status="$?" log "Pull status is '$git_status', checking for changes is '$grep_status'." +# Check whether the continuously running jobs have been updated. echo "$output" | grep "main.js" main_changed="$?" echo "$output" | grep "run.sh" run_changed="$?" +# Determine where we've landed and whether we need to do anything. if [[ $git_status != 0 ]]; then log "*** ERROR: Git reported a failure! ***" exit 1 @@ -59,4 +61,6 @@ else log "*** WARNING: Unknown Situation ***" fi +## Success! ## + exit 0 -- 2.49.1 From eabf56ed934af41866c45b0840dcae68fb3d8b9f Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 14:38:01 -0700 Subject: [PATCH 74/75] Specify that this is not a TODO, just listing TODO items. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a90b44..ad4dc58 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ cd www Then in a web browser, navigate to `localhost:8080`. -## TODO +## TODO Items All goals are currently completed. -- 2.49.1 From 65be246673bb571073f438d570d3c73a114e26ce Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 14:38:27 -0700 Subject: [PATCH 75/75] Remove idea, working fine without it. --- pages/helpers/banner.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pages/helpers/banner.php b/pages/helpers/banner.php index 5833a67..510ae86 100755 --- a/pages/helpers/banner.php +++ b/pages/helpers/banner.php @@ -6,11 +6,6 @@ } $show_pics = $GLOBALS["SHOW_BANNER_PICS"]; $banner_width = $show_pics ? 6 : 12; - - // TBD / TODO: - // Check if user has vertical screen? - // Is that possible in this environment? - //$image_width = $vertical_screen ? 6 : 3; ?>
    -- 2.49.1