diff --git a/cronjob.sh b/check_git.sh similarity index 91% rename from cronjob.sh rename to check_git.sh index 0d8eb51..be2586d 100755 --- a/cronjob.sh +++ b/check_git.sh @@ -25,7 +25,9 @@ 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 + # TBD/TODO: Call check_photos.sh once it has been pulled from run.sh. log "Project reloaded successfully!" } 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/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 -
- Click the link below to download the 4-page PDF: + Use the links below to download the 4-page PDF:
- Click the link below to download the 10-page PDF: + Use the links below to download the 10-page PDF: