Skip to content

Commit 8fc3bb7

Browse files
author
jesperpedersen
committed
Don't depend on IDEA
1 parent 8cd04d1 commit 8fc3bb7

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

config/pre-commit

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33

44
if [ "x$IDEA_HOME" == "x" ]; then
55
echo "IDEA_HOME is not configured; cannot reformat code"
6-
exit 1;
7-
fi
6+
else
7+
HYPERFOIL_ROOT=$(dirname $0)/../../
8+
export IDEA_PROPERTIES=$HYPERFOIL_ROOT/config/idea.properties
89

9-
HYPERFOIL_ROOT=$(dirname $0)/../../
10-
export IDEA_PROPERTIES=$HYPERFOIL_ROOT/config/idea.properties
10+
git diff-index --cached --name-only HEAD > $HYPERFOIL_ROOT/.modified.log
11+
MODIFIED=$(cat $HYPERFOIL_ROOT/.modified.log | wc -l)
12+
echo "Formatting $MODIFIED modified files..."
13+
cat $HYPERFOIL_ROOT/.modified.log | xargs $IDEA_HOME/bin/format.sh -s $HYPERFOIL_ROOT/config/codestyle.xml -m '*.java,*.xml,*.yml,*.yaml' > /dev/null 2> /dev/null
14+
cat $HYPERFOIL_ROOT/.modified.log | xargs git add
15+
rm $HYPERFOIL_ROOT/.modified.log
16+
fi
1117

12-
git diff-index --cached --name-only HEAD > $HYPERFOIL_ROOT/.modified.log
13-
MODIFIED=$(cat $HYPERFOIL_ROOT/.modified.log | wc -l)
14-
echo "Formatting $MODIFIED modified files..."
15-
cat $HYPERFOIL_ROOT/.modified.log | xargs $IDEA_HOME/bin/format.sh -s $HYPERFOIL_ROOT/config/codestyle.xml -m '*.java,*.xml,*.yml,*.yaml' > /dev/null 2> /dev/null
16-
cat $HYPERFOIL_ROOT/.modified.log | xargs git add
17-
rm $HYPERFOIL_ROOT/.modified.log
18+
exit 0

0 commit comments

Comments
 (0)