From 44202669a238b6a2fa2c962386c18ce3dbb6dbad Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Tue, 5 May 2015 16:47:29 +0200 Subject: post-merge: Make sure the expected minified js file exists c897aa84567ba046644a87e23b32f3df4c5845d3 changes the name of the file so we need to make sure it will be created even if no js files changed. Signed-off-by: Florian Pritz --- git-hooks/post-merge | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git-hooks') diff --git a/git-hooks/post-merge b/git-hooks/post-merge index f80a03834..9618b5e31 100755 --- a/git-hooks/post-merge +++ b/git-hooks/post-merge @@ -19,5 +19,9 @@ if echo "$changes" | grep data/js/ > /dev/null; then scripts/optimize_js.sh fi +if [[ ! -f ./data/js/main.min.js ]]; then + scripts/optimize_js.sh +fi + # Show changes to NEWS git diff @{1} NEWS | cat -- cgit v1.2.3-24-g4f1b