diff --git a/.htaccess b/.htaccess deleted file mode 100644 index b927bad..0000000 --- a/.htaccess +++ /dev/null @@ -1,11 +0,0 @@ -FileETag MTime Size -Options -Indexes -DirectoryIndex index.html -AddType text/plain .txt -AddType application/x-python .py -AddType image/x-icon .ico -AddType text/javascript .js -AddType text/css .css -AddDefaultCharset utf-8 -ExpiresActive on -ExpiresByType text/html M86400 diff --git a/publish b/publish index d040b0a..30c2c1d 100644 --- a/publish +++ b/publish @@ -3,7 +3,7 @@ # make build directory and copy original files there for preflighting rm -rf build mkdir build -cp *.py robots.txt .htaccess *.js *.css build/ +cp *.py robots.txt *.js *.css build/ for f in *.html; do python htmlminimizer.py "$f" build/"$f" done @@ -15,18 +15,19 @@ sed -i -e "s|//}.; /\* google\..*|});|g" build/dip3.js # minimize JS and CSS revision=`hg log|grep changeset|cut -d":" -f3|head -1` -java -jar yuicompressor-2.4.2.jar build/dip3.js > build/dip3.$revision.min.js -java -jar yuicompressor-2.4.2.jar build/dip3.css > build/dip3.$revision.min.css -css=`cat build/dip3.$revision.min.css` -sed -i -e "s|dip3\.js|http://wearehugh.com/dip3/dip3.${revision}.min.js|g" build/*.html -#sed -i -e "s|dip3\.css|http://wearehugh.com/dip3/dip3.${revision}.min.css|g" build/*.html +java -jar yuicompressor-2.4.2.jar build/dip3.js > build/$revision.js +java -jar yuicompressor-2.4.2.jar build/dip3.css > build/$revision.css +sed -i -e "s|;}|}|g" build/$revision.css +css=`cat build/$revision.css` +sed -i -e "s|dip3\.js|http://wearehugh.com/dip3/${revision}.js|g" build/*.html +#sed -i -e "s|dip3\.css|http://wearehugh.com/dip3/${revision}.css|g" build/*.html sed -i -e "s|||g" -e "s|