security/hakurei.app
security/hakurei.app
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

rename static_tmp to static-tmp for consistency

Browse Source
This commit is contained in:
Daniel Micay 2021-09-30 16:44:07 -04:00
parent 73e78d4934
commit 956444fd42
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
nginx.conf.tmp nginx.conf.tmp
nginx.conf.root.tmp nginx.conf.root.tmp
node_modules node_modules
static_tmp static-tmp

2
deploy-static
View File

@ -29,7 +29,7 @@ for server in ${servers[@]}; do
ssh $remote rm -rf $target ssh $remote rm -rf $target
ssh $remote cp -a $active $target ssh $remote cp -a $active $target
rsync -rptcv --chmod=D755,F644 --delete static_tmp/ $remote:$target rsync -rptcv --chmod=D755,F644 --delete static-tmp/ $remote:$target
ssh $remote sync -f $target ssh $remote sync -f $target
ssh $remote ln -snf $target /srv/grapheneos.org ssh $remote ln -snf $target /srv/grapheneos.org
ssh $remote sync /srv/grapheneos.org ssh $remote sync /srv/grapheneos.org

4
generate-feed.py
View File

@ -5,7 +5,7 @@ from datetime import datetime
import lxml.html import lxml.html
from lxml import etree from lxml import etree
document = lxml.html.parse("static_tmp/releases.html").getroot() document = lxml.html.parse("static-tmp/releases.html").getroot()
releases = document.body.cssselect("#changelog article") releases = document.body.cssselect("#changelog article")
updated = None updated = None
@ -51,5 +51,5 @@ feed = f"""<?xml version="1.0" encoding="utf-8"?>
</feed> </feed>
""" """
with open("static_tmp/releases.atom", "w") as f: with open("static-tmp/releases.atom", "w") as f:
f.write(feed) f.write(feed)

24
process-static
View File

@ -5,20 +5,20 @@ shopt -s dotglob extglob globstar
export PATH="$PWD/node_modules/.bin:$PATH" export PATH="$PWD/node_modules/.bin:$PATH"
rm -rf static_tmp rm -rf static-tmp
cp -a static static_tmp cp -a static static-tmp
rm -rf static_tmp/js/fastboot/{!(dist),dist/!(fastboot.min.mjs|fastboot.min.mjs.map|vendor)} rm -rf static-tmp/js/fastboot/{!(dist),dist/!(fastboot.min.mjs|fastboot.min.mjs.map|vendor)}
mv static_tmp/js/fastboot/dist static_tmp/js/fastboot/v1.0.9 mv static-tmp/js/fastboot/dist static-tmp/js/fastboot/v1.0.9
for file in static_tmp/**/*.@(json|webmanifest); do for file in static-tmp/**/*.@(json|webmanifest); do
json_reformat -m < "$file" | sponge "$file" json_reformat -m < "$file" | sponge "$file"
done done
find static_tmp -name '*.css' -exec csso {} -o {} \; find static-tmp -name '*.css' -exec csso {} -o {} \;
find static_tmp -name '*.js' -exec terser --ecma 2021 --module -cmo {} {} \; find static-tmp -name '*.js' -exec terser --ecma 2021 --module -cmo {} {} \;
replace="" replace=""
for file in static_tmp/**/*.css static_tmp/js/*.js static_tmp/mask-icon.svg; do for file in static-tmp/**/*.css static-tmp/js/*.js static-tmp/mask-icon.svg; do
hash=$(sha256sum "$file" | head -c 8) hash=$(sha256sum "$file" | head -c 8)
dest="$(dirname $file)/$hash.$(basename $file)" dest="$(dirname $file)/$hash.$(basename $file)"
mv "$file" "$dest" mv "$file" "$dest"
@ -26,9 +26,9 @@ for file in static_tmp/**/*.css static_tmp/js/*.js static_tmp/mask-icon.svg; do
done done
cp nginx/nginx.conf nginx.conf.tmp cp nginx/nginx.conf nginx.conf.tmp
sed -i "$replace" static_tmp/**/*.html nginx.conf.tmp sed -i "$replace" static-tmp/**/*.html nginx.conf.tmp
find static_tmp -name '*.html' -exec html-minifier --collapse-whitespace \ find static-tmp -name '*.html' -exec html-minifier --collapse-whitespace \
--process-scripts "application/ld+json" --collapse-boolean-attributes \ --process-scripts "application/ld+json" --collapse-boolean-attributes \
--remove-attribute-quotes --remove-comments --remove-empty-attributes \ --remove-attribute-quotes --remove-comments --remove-empty-attributes \
--remove-redundant-attributes --remove-script-type-attributes \ --remove-redundant-attributes --remove-script-type-attributes \
@ -36,7 +36,7 @@ find static_tmp -name '*.html' -exec html-minifier --collapse-whitespace \
./generate-feed.py ./generate-feed.py
for file in static_tmp/**/*.@(atom|xml); do for file in static-tmp/**/*.@(atom|xml); do
xmllint --noblanks "$file" --output "$file" xmllint --noblanks "$file" --output "$file"
done done
@ -51,5 +51,5 @@ zopfli_preserve_time() {
} }
export -f zopfli_preserve_time export -f zopfli_preserve_time
find static_tmp -regex '.+\.\(atom\|css\|html\|ico\|js\|json\|mjs\|pdf\|svg\|txt\|webmanifest\|xml\)' | find static-tmp -regex '.+\.\(atom\|css\|html\|ico\|js\|json\|mjs\|pdf\|svg\|txt\|webmanifest\|xml\)' |
parallel -q ::: brotli_k zopfli_preserve_time :::: - parallel -q ::: brotli_k zopfli_preserve_time :::: -

16
validate-static
View File

@ -5,15 +5,15 @@ shopt -s dotglob extglob globstar
export PATH="$PWD/node_modules/.bin:$PATH" export PATH="$PWD/node_modules/.bin:$PATH"
rm -rf static_tmp rm -rf static-tmp
cp -a static static_tmp cp -a static static-tmp
rm -rf static_tmp/js/fastboot/{!(dist),dist/!(fastboot.min.mjs|fastboot.min.mjs.map|vendor)} rm -rf static-tmp/js/fastboot/{!(dist),dist/!(fastboot.min.mjs|fastboot.min.mjs.map|vendor)}
for file in static_tmp/**/*.@(json|webmanifest); do for file in static-tmp/**/*.@(json|webmanifest); do
json_verify < "$file" >/dev/null json_verify < "$file" >/dev/null
done done
xmllint --noout static_tmp/**/*.@(html|svg|xml) xmllint --noout static-tmp/**/*.@(html|svg|xml)
eslint static_tmp/**/!(fastboot.min.m|z-worker-pako.|pako_inflate.min.|)js eslint static-tmp/**/!(fastboot.min.m|z-worker-pako.|pako_inflate.min.|)js
stylelint static_tmp/**/*.css stylelint static-tmp/**/*.css
validatornu --Werror --also-check-css --also-check-svg static_tmp/**/!(bimi).@(css|html|svg) validatornu --Werror --also-check-css --also-check-svg static-tmp/**/!(bimi).@(css|html|svg)