Commit 71a11b7
Changed files (1)
build.sh
@@ -9,6 +9,36 @@ set -e -u -o pipefail
SRCDIR=$(dirname $0)
DESTDIR=$(pwd)
+generate_file_etag() {
+ file=$1
+ prefix=$2
+ # trim: ./ -> /
+ WEB_PATH=$(echo $file | cut -c 2-)
+ SHA=$(shasum $file | awk '{print $1}')
+ echo "$prefix$WEB_PATH \"$SHA\";"
+}
+
+generate_directory_etag() {
+ dir=$1
+ prefix=$2
+ # trim: ./ -> /
+ WEB_PATH=$(echo $dir | cut -c 2-)
+ SHA=$(shasum $dir/index.html | awk '{print $1}')
+ echo "$prefix$WEB_PATH/ \"$SHA\";"
+}
+
+generate_etags() {
+ prefix=$1
+ find . -type f | while read -r file; do
+ generate_file_etag "$file" "$prefix"
+ done | tee -a $DESTDIR/root/usr/local/etc/nginx/etag.map
+ find . -type d | while read -r dir; do
+ if [ -e $dir/index.html ]; then
+ generate_directory_etag "$dir" "$prefix"
+ fi
+ done | tee -a $DESTDIR/root/usr/local/etc/nginx/etag.map
+}
+
# clean and create the output dirs
rm -rf root
mkdir -p root/usr/local/www/git
@@ -29,14 +59,7 @@ mv $SRCDIR/blog/public/ root/usr/local/www/blog
# generate the etags
pushd root/usr/local/www/blog
-find . -type f | while read -r file; do
- # trim: ./ -> /
- WEB_PATH=$(echo $file | cut -c 2-)
- SHA=$(shasum $file | awk '{print $1}')
- echo "$WEB_PATH \"$SHA\";"
-done | tee $DESTDIR/root/usr/local/etc/nginx/etag.map
-INDEX_SHA=$(shasum index.html | awk '{print $1}')
-echo "/ \"$INDEX_SHA\";" | tee -a $DESTDIR/root/usr/local/etc/nginx/etag.map
+generate_etags ""
popd
# get a git checkout and update it for dumb transport
@@ -52,14 +75,7 @@ popd
# generate the etags
pushd root/usr/local/www/git/
-find . -type f | while read -r file; do
- # trim: ./ then later prepend /git/
- WEB_PATH=$(echo $file | cut -c 3-)
- SHA=$(shasum $file | awk '{print $1}')
- echo "/git/$WEB_PATH \"$SHA\";"
-done | tee -a $DESTDIR/root/usr/local/etc/nginx/etag.map
-INDEX_SHA=$(shasum www/index.html | awk '{print $1}')
-echo "/git/ \"$INDEX_SHA\";" | tee -a $DESTDIR/root/usr/local/etc/nginx/etag.map
+generate_etags "/git"
popd
# compress the files