From 7735bd4eb24f0d53a93473570ff12d56a132b370 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Sun, 14 Feb 2021 19:36:36 +0100 Subject: Move site.conf import to site.default.conf --- scripts/build_content.sh | 4 ---- scripts/build_fonts.sh | 4 ---- scripts/build_sass.sh | 4 ---- scripts/deploy.sh | 4 ---- scripts/watch_content.sh | 4 ---- scripts/watch_filters.sh | 4 ---- scripts/watch_metadata.sh | 4 ---- scripts/watch_sass.sh | 4 ---- scripts/watch_templates.sh | 4 ---- 9 files changed, 36 deletions(-) (limited to 'scripts') diff --git a/scripts/build_content.sh b/scripts/build_content.sh index 41c2a4b..160f64d 100755 --- a/scripts/build_content.sh +++ b/scripts/build_content.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - get_filters() { local filters_args="" diff --git a/scripts/build_fonts.sh b/scripts/build_fonts.sh index 9823fcf..0e9cd91 100755 --- a/scripts/build_fonts.sh +++ b/scripts/build_fonts.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - find "${ASSETS_DIR}fonts" \ -type f \ -name "*.ttf" \ diff --git a/scripts/build_sass.sh b/scripts/build_sass.sh index 5bb24d4..2f3d169 100755 --- a/scripts/build_sass.sh +++ b/scripts/build_sass.sh @@ -2,9 +2,5 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - echo -e "\033[0;32m[COMPILE ]\033[0m ${ASSETS_DIR}css/style.scss -> ${OUTPUT_DIR}style.css" sassc ${ASSETS_DIR}css/style.scss | node_modules/.bin/csso > "${OUTPUT_DIR}style.css" diff --git a/scripts/deploy.sh b/scripts/deploy.sh index ef454bb..a810b74 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,9 +2,5 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - echo -e "\033[0;32m[DEPLOY ]\033[0m $DEPLOY_TARGET" rsync --progress --stats -rvz --delete "$OUTPUT_DIR" "$DEPLOY_TARGET" diff --git a/scripts/watch_content.sh b/scripts/watch_content.sh index 66b726f..dfaa638 100755 --- a/scripts/watch_content.sh +++ b/scripts/watch_content.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - inotifywait -qrme close_write,delete,move --format "%w%f" "${CONTENT_DIR%/}" \ | while read file do diff --git a/scripts/watch_filters.sh b/scripts/watch_filters.sh index 21fb686..5dd6ad5 100755 --- a/scripts/watch_filters.sh +++ b/scripts/watch_filters.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - inotifywait -qrme close_write,delete,move --format "%w%f" "${FILTERS_DIR%/}" \ | while read file do diff --git a/scripts/watch_metadata.sh b/scripts/watch_metadata.sh index cc02ea7..2f6efde 100755 --- a/scripts/watch_metadata.sh +++ b/scripts/watch_metadata.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - inotifywait -qrme close_write,delete,move --format "%w%f" "${METADATA_DIR%/}" \ | while read file do diff --git a/scripts/watch_sass.sh b/scripts/watch_sass.sh index 11c210a..7345eb3 100755 --- a/scripts/watch_sass.sh +++ b/scripts/watch_sass.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - inotifywait -qrme close_write,delete,move --format "%w%f" "${ASSETS_DIR}css" \ | while read file do diff --git a/scripts/watch_templates.sh b/scripts/watch_templates.sh index b6149e7..70ae4c3 100755 --- a/scripts/watch_templates.sh +++ b/scripts/watch_templates.sh @@ -2,10 +2,6 @@ source "site.defaults.conf" -if [ -f "site.conf" ]; then - source "site.conf" -fi - inotifywait -qrme close_write,delete,move --format "%w%f" "${TEMPLATES_DIR%/}" \ | while read file do -- cgit v1.2.3-54-g00ecf