Skip to content

Commit 16ebadc

Browse files
committed
fix error with git diff in AnalysisTreeHashWriter.sh
1 parent 15efd79 commit 16ebadc

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

cmake/AnalysisTreeHashWriter.sh

+21-19
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,31 @@
22

33
FILE_HASH=AnalysisTreeHash.sh
44
FILE_DIFF=AnalysisTreeDiff.patch
5-
if [ -f $FILE_HASH ]; then
6-
rm $FILE_HASH $FILE_DIFF
7-
fi
5+
for F in $FILE_HASH $FILE_DIFF; do
6+
if [ -f $F ]; then
7+
rm $F
8+
fi
9+
done
810

911
SRC_DIR=${1}
1012

1113
cd $SRC_DIR
1214
if [ -d ".git" ]; then
13-
GITTAG=$(git describe --tags)
14-
GITCOMMIT=$(git rev-parse HEAD)
15-
GITSTATUS=$(git status --porcelain)
16-
cd -
17-
echo "export ANALYSIS_TREE_TAG=\"${GITTAG}\"" >> $FILE_HASH
18-
echo "export ANALYSIS_TREE_COMMIT_HASH=${GITCOMMIT}" >> $FILE_HASH
19-
if [ -z "${GITSTATUS}" ]; then
20-
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=TRUE" >> $FILE_HASH
21-
else
22-
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=FALSE" >> $FILE_HASH
23-
fi
24-
git diff >> $FILE_DIFF
15+
GITTAG=$(git describe --tags)
16+
GITCOMMIT=$(git rev-parse HEAD)
17+
GITSTATUS=$(git status --porcelain)
18+
cd -
19+
echo "export ANALYSIS_TREE_TAG=\"${GITTAG}\"" >> $FILE_HASH
20+
echo "export ANALYSIS_TREE_COMMIT_HASH=${GITCOMMIT}" >> $FILE_HASH
21+
if [ -z "${GITSTATUS}" ]; then
22+
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=TRUE" >> $FILE_HASH
23+
else
24+
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=FALSE" >> $FILE_HASH
25+
git diff >> $FILE_DIFF
26+
fi
2527
else
26-
cd -
27-
echo "export ANALYSIS_TREE_TAG=NOT_A_GIT_REPO" >> $FILE_HASH
28-
echo "export ANALYSIS_TREE_COMMIT_HASH=NOT_A_GIT_REPO" >> $FILE_HASH
29-
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=NOT_A_GIT_REPO" >> $FILE_HASH
28+
cd -
29+
echo "export ANALYSIS_TREE_TAG=NOT_A_GIT_REPO" >> $FILE_HASH
30+
echo "export ANALYSIS_TREE_COMMIT_HASH=NOT_A_GIT_REPO" >> $FILE_HASH
31+
echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=NOT_A_GIT_REPO" >> $FILE_HASH
3032
fi

0 commit comments

Comments
 (0)