diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-05-05 16:47:29 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-05 16:51:47 +0200 |
| commit | 44202669a238b6a2fa2c962386c18ce3dbb6dbad (patch) | |
| tree | 85edb10fd760d587fc3b26cc8187b9049a5122ae /git-hooks/post-merge | |
| parent | a8251204b686a603fe4e658e59008113e0e8f4e7 (diff) | |
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 <bluewind@xinu.at>
Diffstat (limited to 'git-hooks/post-merge')
| -rwxr-xr-x | git-hooks/post-merge | 4 |
1 files changed, 4 insertions, 0 deletions
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 |