From bde47bb5b29aae57f1cc682192bd31d2d9b477e4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 14 Mar 2017 22:10:27 -0400
Subject: commit the post-receive hook

---
 bin/post-receive.githook | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 bin/post-receive.githook

(limited to 'bin/post-receive.githook')

diff --git a/bin/post-receive.githook b/bin/post-receive.githook
new file mode 100755
index 0000000..8292df0
--- /dev/null
+++ b/bin/post-receive.githook
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+whoami
+export LANG=en_US.UTF-8
+
+unset GIT_DIR
+cd /srv/http/www.andrewdm.me
+git pull --ff-only
-- 
cgit v1.2.3-54-g00ecf


From ee71849692690e9cd81852434f5babb5d63dc8bb Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 14 Mar 2017 22:24:38 -0400
Subject: Run pre-generate server-side if it didn't already run

---
 bin/post-commit.githook  |  1 -
 bin/post-receive.githook | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'bin/post-receive.githook')

diff --git a/bin/post-commit.githook b/bin/post-commit.githook
index 997afa3..5b05947 100755
--- a/bin/post-commit.githook
+++ b/bin/post-commit.githook
@@ -3,4 +3,3 @@ set -e
 d="$(dirname -- "$(readlink -f -- "$0")")"
 
 "$d"/auto-changelog
-"$d"/pre-generate &>/dev/tty &
diff --git a/bin/post-receive.githook b/bin/post-receive.githook
index 8292df0..53de38c 100755
--- a/bin/post-receive.githook
+++ b/bin/post-receive.githook
@@ -2,7 +2,17 @@
 set -e
 whoami
 export LANG=en_US.UTF-8
-
 unset GIT_DIR
+
+if ! git merge-base --is-ancestor master pre-generated; then
+	dir="$(mktemp --tmpdir -d www-generate.XXXXXXXXXX)"
+	git clone "$PWD" "$dir"
+	pushd "$dir"
+	bin/pre-generate
+	git push origin pre-generated
+	popd
+	rm -rf -- "$dir"
+fi
+
 cd /srv/http/www.andrewdm.me
 git pull --ff-only
-- 
cgit v1.2.3-54-g00ecf


From 5a5547251f0a29bb41832e240f9f15cb5cf002bc Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 14 Mar 2017 22:29:34 -0400
Subject: post-receive: adjust PATH with .profile if necessary

---
 bin/post-receive.githook | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'bin/post-receive.githook')

diff --git a/bin/post-receive.githook b/bin/post-receive.githook
index 53de38c..ddd74c3 100755
--- a/bin/post-receive.githook
+++ b/bin/post-receive.githook
@@ -4,6 +4,10 @@ whoami
 export LANG=en_US.UTF-8
 unset GIT_DIR
 
+if ! type scss; then
+	. ~/.profile
+fi
+
 if ! git merge-base --is-ancestor master pre-generated; then
 	dir="$(mktemp --tmpdir -d www-generate.XXXXXXXXXX)"
 	git clone "$PWD" "$dir"
-- 
cgit v1.2.3-54-g00ecf