diff --git a/pages/helpers/header.php b/pages/helpers/header.php index 4f2350b..1d57e9b 100755 --- a/pages/helpers/header.php +++ b/pages/helpers/header.php @@ -29,4 +29,17 @@ + + + + + + + + + + + + + diff --git a/pages/lists.php b/pages/lists.php deleted file mode 100755 index ec87496..0000000 --- a/pages/lists.php +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/php - - - -
-

Lists

-
-
-

Gear

- -

Apps

- - -
-

- Gear that I find critical to my life. -

- -
- - -
-

- Apps that I use frequently on a degoogled Android phone. -

-
-
- - diff --git a/pages/photos.sh b/pages/photos.sh index 2924752..6e87a93 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -131,13 +131,15 @@ function build_album_pages { fi ## Put in the subpage HTML ## - # Set the count if this is the first loop. + new_row="\t\t
" + # Set the count and start a row if this is the first loop. if [[ -z $count ]]; then count=0 - fi - # Add a row for the next 2 images. - if (( $count % 2 == 0 )); then - echo -e "\t\t
" >> $subpage + echo -e "$newrow" >> $subpage + # Else check if we need to start a new one for the next 2 images. + elif (( $count % 2 == 0 )); then + echo -e "\t\t
" >> $subpage + echo -e "$newrow" >> $subpage fi # Add the container for the image and its text. echo -e "\t\t\t
" >> $subpage @@ -160,10 +162,6 @@ function build_album_pages { fi # Close the image description and its link. echo -e "

\n\t\t\t\t\n\t\t\t
" >> $subpage - # Close the row after an odd count. - if (( $count % 2 == 1 )); then - echo -e "\t\t
" >> $subpage - fi count=$(( count + 1 )) done echo -e "\t\t" >> $subpage @@ -249,7 +247,8 @@ function build_all_page { count=0 fi if [[ $count == 0 ]]; then - echo -e "\t\t
" >> $allpage + echo -e "\t\t
" >> $allpage + echo -e "\t\t
" >> $allpage fi # Add a column. @@ -291,10 +290,16 @@ function build_all_page { } ## Main ## +beg_time="$SECONDS" + start_main_page build_album_pages build_all_page end_main_page +end_time="$SECONDS" +time="$(( $end_time - $beg_time ))" +echo "" >> $mainpage + cat $mainpage exit 0 diff --git a/pages/resources.php b/pages/resources.php new file mode 100755 index 0000000..832f821 --- /dev/null +++ b/pages/resources.php @@ -0,0 +1,74 @@ +#!/usr/bin/php + + + +
+

Lists of Resources

+
+ + +
+

+ Books +

+
+

+ TBD/TODO: Berk list description goes here! +

+

+ Another line fortesting. +

+

+ Yet another line fortesting. +

+
    +
  • + The Peaceful Warrior +
    • +
  • + TBD: Name of book on healing through breathing and posture. +
    • +
  • + The Untethered Soul / Living Untethered +
    • +
+
+
+ + +
+

+ + Apps (Repo TBD/TODO) + +

+
+

+ Obtaiumiun config for apps that I use on a degoogled Android phone. +

+
+
+ + +
+

+ Gear +

+
+

+ Important gear I recommend. +

+
+
+ + diff --git a/pages/subpages/home/apps.php b/pages/subpages/home/apps.php index ac0ae35..4b5b0b1 100755 --- a/pages/subpages/home/apps.php +++ b/pages/subpages/home/apps.php @@ -207,6 +207,28 @@
+
+

Obtainium Configuration

+
+ +
+
+

+ In order to have the correct version numbers in Obtainium: +

+ +

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

+
+
+

Other Programs

diff --git a/run.sh b/run.sh index 2790b0c..e3a29c9 100755 --- a/run.sh +++ b/run.sh @@ -99,11 +99,12 @@ find files/photos/ -name "*".html -print -delete 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`" + 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." @@ -112,7 +113,9 @@ find files/photos/ -name "*".html -print -delete count=$(( count + 1 )) fi done - log "Finished checking for /photos/." + end_time="$SECONDS" + time="$(( $end_time - $beg_time ))" + log "Finished checking for /photos/ after '$time' seconds." } & ## Main ##