Improved assets

Makefile

+PUG = $(shell pwd)/node_modules/pug-cli/index.js --basedir .
+
+all: index.html privacy-policy/index.html releases/index.html
+
+%.html: %.pug
+	$(PUG) $<

assets/css/Makefile

 SASS = $(shell pwd)/../../node_modules/node-sass/bin/node-sass --output-style compressed
+
 all: fonts.css style.css important.css semantic.css
-fonts.css: fonts.sass
-	$(SASS) fonts.sass -o .
-style.css: style.sass
-	$(SASS) style.sass -o .
-important.css: important.scss
-	$(SASS) important.scss -o .
-semantic.css: semantic.scss
-	$(SASS) semantic.scss -o .
+
+%.css: %.sass
+	$(SASS) $< -o .
+%.css: %.scss
+	$(SASS) $< -o .

assets/css/generate_makefile.sh

-#!/bin/bash
-
-cd $(dirname $(realpath -s ${0}))
-
-RULES=()
-
-function generate_rule() {
-  file=${1}
-  filename=${2}
-
-  RULES+=("${filename}.css")
-  echo "${filename}.css: ${file}" >> Makefile.wip
-  echo "	\$(SASS) ${file} -o ." >> Makefile.wip
-}
-
-function finalize() {
-  echo -n "all:" >> Makefile
-  for rule in "${RULES[@]}"; do
-    echo -n " $rule" >> Makefile
-  done
-  echo >> Makefile
-  cat Makefile.wip >> Makefile
-  rm Makefile.wip
-}
-
-cat <<EOF > Makefile
-SASS = \$(shell pwd)/../../node_modules/node-sass/bin/node-sass --output-style compressed
-EOF
-for file in *.sass; do
-  generate_rule ${file} ${file%.*}
-done
-for file in *.scss; do
-  generate_rule ${file} ${file%.*}
-done
-
-finalize
\ No newline at end of file

package.json

@@ -3,9 +3,9 @@
   "version": "3.0.0",
   "description": "This is a websearch frontend for a quassel database.",
   "scripts": {
-    "pug": "node_modules/pug-cli/index.js --basedir . **/index.pug index.pug",
-    "sass": "assets/css/generate_makefile.sh  && cd assets/css && make",
-    "images": "assets/images/generate_makefile.sh && cd assets/images && make",
+    "pug": "make -j8",
+    "sass": "cd assets/css && make -j8",
+    "images": "assets/images/generate_makefile.sh && cd assets/images && make -j8",
     "build": "npm run images && npm run sass && npm run pug"
   },
   "author": "Janne Koschinski",