rename static_tmp to static-tmp for consistency

This commit is contained in:
Daniel Micay 2021-11-23 18:45:28 -05:00
parent 0ae1a5a9f4
commit 5fcd75f795
3 changed files with 6 additions and 6 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
nginx.conf.tmp
static_tmp
static-tmp

View File

@ -19,7 +19,7 @@ echo
ssh $remote rm -rf $target
ssh $remote cp -a $active $target
rsync -rpcv --chmod=D755,F644 --delete static_tmp/ $remote:$target
rsync -rpcv --chmod=D755,F644 --delete static-tmp/ $remote:$target
ssh $remote sync -f $target
ssh $remote ln -snf $target /srv/element.grapheneos.org
ssh $remote sync /srv/element.grapheneos.org

View File

@ -5,9 +5,9 @@ shopt -s dotglob extglob globstar
export PATH="$PWD/node_modules/.bin:$PATH"
rm -rf static_tmp
cp -a /usr/share/webapps/element static_tmp
cp --remove-destination webapps/element/config.json static_tmp/config.json
rm -rf static-tmp
cp -a /usr/share/webapps/element static-tmp
cp --remove-destination webapps/element/config.json static-tmp/config.json
cp nginx/nginx.conf nginx.conf.tmp
@ -22,5 +22,5 @@ zopfli_preserve_time() {
}
export -f zopfli_preserve_time
find static_tmp -regex '.+\.\(css\|html\|ico\|js\|json\|map\|svg\|txt\|webmanifest\|xml\|wasm\)' |
find static-tmp -regex '.+\.\(css\|html\|ico\|js\|json\|map\|svg\|txt\|webmanifest\|xml\|wasm\)' |
parallel -q ::: brotli_k zopfli_preserve_time :::: -