From 16ebadc8a7f221382d35675c214577134c1be4ae Mon Sep 17 00:00:00 2001 From: Oleksii Lubynets Date: Mon, 5 Aug 2024 17:45:04 +0200 Subject: [PATCH] fix error with git diff in AnalysisTreeHashWriter.sh --- cmake/AnalysisTreeHashWriter.sh | 40 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/cmake/AnalysisTreeHashWriter.sh b/cmake/AnalysisTreeHashWriter.sh index 7d02f65e..c09da506 100755 --- a/cmake/AnalysisTreeHashWriter.sh +++ b/cmake/AnalysisTreeHashWriter.sh @@ -2,29 +2,31 @@ FILE_HASH=AnalysisTreeHash.sh FILE_DIFF=AnalysisTreeDiff.patch -if [ -f $FILE_HASH ]; then -rm $FILE_HASH $FILE_DIFF -fi +for F in $FILE_HASH $FILE_DIFF; do + if [ -f $F ]; then + rm $F + fi +done SRC_DIR=${1} cd $SRC_DIR if [ -d ".git" ]; then -GITTAG=$(git describe --tags) -GITCOMMIT=$(git rev-parse HEAD) -GITSTATUS=$(git status --porcelain) -cd - -echo "export ANALYSIS_TREE_TAG=\"${GITTAG}\"" >> $FILE_HASH -echo "export ANALYSIS_TREE_COMMIT_HASH=${GITCOMMIT}" >> $FILE_HASH -if [ -z "${GITSTATUS}" ]; then -echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=TRUE" >> $FILE_HASH -else -echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=FALSE" >> $FILE_HASH -fi -git diff >> $FILE_DIFF + GITTAG=$(git describe --tags) + GITCOMMIT=$(git rev-parse HEAD) + GITSTATUS=$(git status --porcelain) + cd - + echo "export ANALYSIS_TREE_TAG=\"${GITTAG}\"" >> $FILE_HASH + echo "export ANALYSIS_TREE_COMMIT_HASH=${GITCOMMIT}" >> $FILE_HASH + if [ -z "${GITSTATUS}" ]; then + echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=TRUE" >> $FILE_HASH + else + echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=FALSE" >> $FILE_HASH + git diff >> $FILE_DIFF + fi else -cd - -echo "export ANALYSIS_TREE_TAG=NOT_A_GIT_REPO" >> $FILE_HASH -echo "export ANALYSIS_TREE_COMMIT_HASH=NOT_A_GIT_REPO" >> $FILE_HASH -echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=NOT_A_GIT_REPO" >> $FILE_HASH + cd - + echo "export ANALYSIS_TREE_TAG=NOT_A_GIT_REPO" >> $FILE_HASH + echo "export ANALYSIS_TREE_COMMIT_HASH=NOT_A_GIT_REPO" >> $FILE_HASH + echo "export ANALYSIS_TREE_COMMIT_ORIGINAL=NOT_A_GIT_REPO" >> $FILE_HASH fi