From 141673d9498cb0b083592b69cdc6a034248b01cb Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Sat, 2 Jun 2018 08:53:04 -0400
Subject: [PATCH] Move stylesheet generation to Makefile

Also makes LESS installation easier.
---
 Makefile             | 17 +++++++++++++++++
 README.md            |  2 +-
 generate.sh          |  5 -----
 less/Makefile        | 18 ++++++++++++++++++
 less/install-less.sh |  9 +++++++++
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 Makefile
 delete mode 100755 generate.sh
 create mode 100644 less/Makefile
 create mode 100755 less/install-less.sh

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0202b00
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,17 @@
+GOPATH := ${PWD}:${GOPATH}
+export GOPATH
+
+build: ui
+
+install: build-go
+	cd less/; $(MAKE) install $(MFLAGS)
+
+ui: 
+	cd less/; $(MAKE) $(MFLAGS)
+
+build-go:
+	go get -d
+	go install ./cmd/publicbio
+
+clean: 
+	cd less/; $(MAKE) clean $(MFLAGS)
diff --git a/README.md b/README.md
index 74d42cd..ea9dca3 100644
--- a/README.md
+++ b/README.md
@@ -16,4 +16,4 @@ You'll see your site at `localhost:8080`. Provide a different port with the `-p`
 
 ## Development
 
-After updating styles, run `./generate.sh`.
+After updating styles, run `make`.
diff --git a/generate.sh b/generate.sh
deleted file mode 100755
index df5ac1f..0000000
--- a/generate.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-CSSDIR=static/css/
-
-lessc less/app.less --clean-css="--s1 --advanced" ${CSSDIR}main.css
diff --git a/less/Makefile b/less/Makefile
new file mode 100644
index 0000000..e926c05
--- /dev/null
+++ b/less/Makefile
@@ -0,0 +1,18 @@
+ifeq ($(shell which lessc),/usr/bin/lessc)
+	LESSC=/usr/bin/lessc
+else
+	LESSC=node_modules/.bin/lessc
+endif
+export LESSC
+
+CSSDIR=../static/css/
+
+all :
+	$(LESSC) app.less --clean-css="--s1 --advanced" $(CSSDIR)main.css
+
+install : 
+	./install-less.sh
+	$(MAKE) all
+
+clean :
+	rm -f $(CSSDIR)main.css
diff --git a/less/install-less.sh b/less/install-less.sh
new file mode 100755
index 0000000..fc86ad2
--- /dev/null
+++ b/less/install-less.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Install Less via npm
+if [ ! -e "$(which lessc)" ]; then
+	sudo npm install -g less
+	sudo npm install -g less-plugin-clean-css
+else
+    echo LESS $(npm view less version 2>&1 | grep -v WARN) is installed
+fi