From 2159c730c57cd9e8f8525dd61a2189c777f57b09 Mon Sep 17 00:00:00 2001
From: squidfunk <scifish@gmail.com>
Date: Thu, 6 Oct 2016 15:45:41 +0200
Subject: [PATCH] Introduced post-merge hook to update dependencies

---
 .githooks/post-merge/npm-update.sh | 30 ++++++++++++++++++++++++++++++
 .githooks/pre-commit/lint.sh       |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100755 .githooks/post-merge/npm-update.sh

diff --git a/.githooks/post-merge/npm-update.sh b/.githooks/post-merge/npm-update.sh
new file mode 100755
index 000000000..e567174d7
--- /dev/null
+++ b/.githooks/post-merge/npm-update.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright (c) 2016 Martin Donath <martin.donath@squidfunk.com>
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+# Check, if all changes are added to the index
+CHANGED="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
+
+# Perform install and prune of NPM dependencies if package.json changed
+if $(echo "$CHANGED" | grep --quiet package.json); then
+  echo "Hook[post-merge]: Updating dependencies..."
+  npm install && npm prune
+fi
\ No newline at end of file
diff --git a/.githooks/pre-commit/lint.sh b/.githooks/pre-commit/lint.sh
index cd9c7825d..aa3400ff3 100755
--- a/.githooks/pre-commit/lint.sh
+++ b/.githooks/pre-commit/lint.sh
@@ -20,7 +20,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-# Checking if all changes are added to the index
+# Check, if all changes are added to the index
 CWD_CLEAN="$(git diff-index HEAD --)"
 
 # This variables stores the state of the stash.