summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/build_content.sh4
-rwxr-xr-xscripts/build_fonts.sh4
-rwxr-xr-xscripts/build_sass.sh4
-rwxr-xr-xscripts/deploy.sh4
-rwxr-xr-xscripts/watch_content.sh4
-rwxr-xr-xscripts/watch_filters.sh4
-rwxr-xr-xscripts/watch_metadata.sh4
-rwxr-xr-xscripts/watch_sass.sh4
-rwxr-xr-xscripts/watch_templates.sh4
-rw-r--r--site.defaults.conf4
10 files changed, 4 insertions, 36 deletions
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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9get_filters() { 5get_filters() {
10 local filters_args="" 6 local filters_args=""
11 7
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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9find "${ASSETS_DIR}fonts" \ 5find "${ASSETS_DIR}fonts" \
10 -type f \ 6 -type f \
11 -name "*.ttf" \ 7 -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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9echo -e "\033[0;32m[COMPILE ]\033[0m ${ASSETS_DIR}css/style.scss -> ${OUTPUT_DIR}style.css" 5echo -e "\033[0;32m[COMPILE ]\033[0m ${ASSETS_DIR}css/style.scss -> ${OUTPUT_DIR}style.css"
10sassc ${ASSETS_DIR}css/style.scss | node_modules/.bin/csso > "${OUTPUT_DIR}style.css" 6sassc ${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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9echo -e "\033[0;32m[DEPLOY ]\033[0m $DEPLOY_TARGET" 5echo -e "\033[0;32m[DEPLOY ]\033[0m $DEPLOY_TARGET"
10rsync --progress --stats -rvz --delete "$OUTPUT_DIR" "$DEPLOY_TARGET" 6rsync --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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9inotifywait -qrme close_write,delete,move --format "%w%f" "${CONTENT_DIR%/}" \ 5inotifywait -qrme close_write,delete,move --format "%w%f" "${CONTENT_DIR%/}" \
10 | while read file 6 | while read file
11 do 7 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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9inotifywait -qrme close_write,delete,move --format "%w%f" "${FILTERS_DIR%/}" \ 5inotifywait -qrme close_write,delete,move --format "%w%f" "${FILTERS_DIR%/}" \
10 | while read file 6 | while read file
11 do 7 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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9inotifywait -qrme close_write,delete,move --format "%w%f" "${METADATA_DIR%/}" \ 5inotifywait -qrme close_write,delete,move --format "%w%f" "${METADATA_DIR%/}" \
10 | while read file 6 | while read file
11 do 7 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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9inotifywait -qrme close_write,delete,move --format "%w%f" "${ASSETS_DIR}css" \ 5inotifywait -qrme close_write,delete,move --format "%w%f" "${ASSETS_DIR}css" \
10 | while read file 6 | while read file
11 do 7 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 @@
2 2
3source "site.defaults.conf" 3source "site.defaults.conf"
4 4
5if [ -f "site.conf" ]; then
6 source "site.conf"
7fi
8
9inotifywait -qrme close_write,delete,move --format "%w%f" "${TEMPLATES_DIR%/}" \ 5inotifywait -qrme close_write,delete,move --format "%w%f" "${TEMPLATES_DIR%/}" \
10 | while read file 6 | while read file
11 do 7 do
diff --git a/site.defaults.conf b/site.defaults.conf
index 50e45b5..de4ac4c 100644
--- a/site.defaults.conf
+++ b/site.defaults.conf
@@ -6,3 +6,7 @@ FILTERS_DIR="filters/"
6METADATA_DIR="metadata/" 6METADATA_DIR="metadata/"
7TEMPLATES_DIR="templates/" 7TEMPLATES_DIR="templates/"
8OUTPUT_DIR="output/" 8OUTPUT_DIR="output/"
9
10if [ -f "site.conf" ]; then
11 source "site.conf"
12fi