##// END OF EJS Templates
Merge pull request #6289 from takluyver/git-hooks-bash...
Min RK -
r17652:944c2cf5 merge
parent child Browse files
Show More
@@ -1,22 +1,22 b''
1 #!/bin/sh
1 #!/bin/bash
2
2
3 git submodule init
3 git submodule init
4 git submodule update
4 git submodule update
5
5
6 if [[ "$(basename $0)" == "post-merge" ]]; then
6 if [[ "$(basename $0)" == "post-merge" ]]; then
7 PREVIOUS_HEAD=ORIG_HEAD
7 PREVIOUS_HEAD=ORIG_HEAD
8 else
8 else
9 PREVIOUS_HEAD=$1
9 PREVIOUS_HEAD=$1
10 fi
10 fi
11
11
12 # if style changed (and less/fabric available), rebuild sourcemaps
12 # if style changed (and less/fabric available), rebuild sourcemaps
13 if [[
13 if [[
14 ! -z "$(git diff $PREVIOUS_HEAD IPython/html/static/style/ipython.min.css)"
14 ! -z "$(git diff $PREVIOUS_HEAD IPython/html/static/style/ipython.min.css)"
15 && ! -z "$(git diff $PREVIOUS_HEAD IPython/html/static/style/style.min.css)"
15 && ! -z "$(git diff $PREVIOUS_HEAD IPython/html/static/style/style.min.css)"
16 && ! -z $(which 2>/dev/null lessc)
16 && ! -z $(which 2>/dev/null lessc)
17 && ! -z $(which 2>/dev/null fab)
17 && ! -z $(which 2>/dev/null fab)
18 ]]; then
18 ]]; then
19 echo "rebuilding sourcemaps"
19 echo "rebuilding sourcemaps"
20 cd IPython/html
20 cd IPython/html
21 fab css || echo "failed to compile css"
21 fab css || echo "failed to compile css"
22 fi
22 fi
General Comments 0
You need to be logged in to leave comments. Login now