Skip to content

Commit 6681766

Browse files
committedApr 2, 2017
Mac compatibility for prepare-commit.sh
1 parent cd559ea commit 6681766

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed
 

‎scripts/prepare-commit.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ PATH=$TOPLEVEL/scripts:$PATH
2020

2121
cd $TOPLEVEL
2222

23+
# GNU prefix command for mac os support (gsed, gsplit)
24+
GP=
25+
if [[ "$OSTYPE" =~ darwin* ]]; then
26+
GP=g
27+
fi
28+
2329
if ! type -p astyle.sh >/dev/null; then
2430
echo astyle.sh not found
2531
exit 1
@@ -40,7 +46,7 @@ fi
4046
set -e
4147

4248
# determine changed files
43-
MODIFIED=$(git status --porcelain| sed -ne "s/^ *[MA] *//p" | sort -u)
49+
MODIFIED=$(git status --porcelain| ${GP}sed -ne "s/^ *[MA] *//p" | sort -u)
4450

4551
if [ -z "$MODIFIED" ]; then
4652
echo nothing was modified
@@ -108,11 +114,11 @@ for f in $MODIFIED; do
108114
if [[ $f =~ ^src\/(core|gui|analysis)\/.*\.h$ ]]; then
109115
# look if corresponding SIP file
110116
#echo $f
111-
sip_include=$(sed -r 's/^src\/(\w+)\/.*$/python\/\1\/\1.sip/' <<< $f )
112-
sip_file=$(sed -r 's/^src\/(core|gui|analysis)\///; s/\.h$/.sip/' <<<$f )
117+
sip_include=$(${GP}sed -r 's/^src\/(\w+)\/.*$/python\/\1\/\1.sip/' <<< $f )
118+
sip_file=$(${GP}sed -r 's/^src\/(core|gui|analysis)\///; s/\.h$/.sip/' <<<$f )
113119
if grep -Exq "^\s*%Include $sip_file" ${TOPLEVEL}/$sip_include ; then
114120
#echo "in SIP"
115-
sip_file=$(sed -r 's/^src\///; s/\.h$/.sip/' <<<$f )
121+
sip_file=$(${GP}sed -r 's/^src\///; s/\.h$/.sip/' <<<$f )
116122
# check it is not blacklisted (i.e. manualy SIP)
117123
if ! grep -Fxq "$sip_file" python/auto_sip.blacklist; then
118124
#echo "automatic file"

0 commit comments

Comments
 (0)
Please sign in to comment.