diff --git a/Makefile b/Makefile index f515f61..8e6d539 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,12 @@ netlifyapis: clean: [ -z "${CI}" ] || rm -rfv requirements.txt \ + runtime.txt \ README.md \ git.sh \ scripts \ .vscode \ - .github \ + .github netlify: build netlifyapis clean diff --git a/README.md b/README.md index 646d8b9..a67b45c 100644 --- a/README.md +++ b/README.md @@ -79,3 +79,4 @@ how much per avg sites are using: - https://school.ari-web.xyz/ (source: proprietary (I don't want people snooping on my homework lol)) - https://user.ari-web.xyz/ (source: https://user.ari-web.xyz/git) - https://3.ari-web.xyz/ (source: https://3.ari-web.xyz/git) +- https://etc.ari-web.xyz/ (source: https://etc.ari-web.xyz/git) diff --git a/index.html b/index.html index 70fe6a9..d26ab25 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ > Removing all .min.css files' - find content/ -name '*.min.css' -type f -exec rm -rfv {} \; + find content/ -not -ipath "./node_modules/*" -name '*.min.css' -type f -exec rm -rfv {} \; } main "$@" diff --git a/scripts/minhtml.sh b/scripts/minhtml.sh index 6a94bf7..175cb23 100755 --- a/scripts/minhtml.sh +++ b/scripts/minhtml.sh @@ -6,7 +6,7 @@ main() { if [ "$CI" ]; then echo 'Minifying all HTML' - find . -type f -name "*.html" \ + find . -not -ipath "./node_modules/*" -type f -name "*.html" \ -exec html-minifier --collapse-whitespace --collapse-inline-tag-whitespace --remove-tag-whitespace -o {}.min {} \; \ -exec rm {} \; \ -exec mv {}.min {} \; \ diff --git a/scripts/minjs.sh b/scripts/minjs.sh index 55672da..f6e76fe 100755 --- a/scripts/minjs.sh +++ b/scripts/minjs.sh @@ -6,7 +6,7 @@ main() { if [ "$CI" ]; then echo 'Minifying all JavaScript' - find content/js/ -type f \ + find content/js/ -not -ipath "./node_modules/*" -type f \ -name "*.js" ! -name "*.min.*" ! -name "vfs_fonts*" \ -exec uglifyjs --compress sequences=true,conditionals=true,booleans=true -o {}.min {} \; \ -exec rm {} \; \ diff --git a/scripts/sass.sh b/scripts/sass.sh index 9b27c9a..cd96767 100755 --- a/scripts/sass.sh +++ b/scripts/sass.sh @@ -3,7 +3,7 @@ set -e main() { - for file in $(find content/ -name '*.scss' -type f); do + for file in $(find content/ -not -ipath "./node_modules/*" -name '*.scss' -type f); do bnam="${file##*/}" out="${file%/*}/${bnam%.*}.min.css" @@ -19,7 +19,7 @@ main() { wait echo " >> Removing residuals" - find content/ -name '_*.min.css' -or \ + find content/ -not -ipath "./node_modules/*" -name '_*.min.css' -or \ -name '*.sass.css' -type f -exec rm -rfv {} \; }