fix error with git diff in AnalysisTreeHashWriter.sh

lubynets · Aug 5, 2024 · 16ebadc · 16ebadc
1 parent 15efd79
commit 16ebadc
Showing 1 changed file with 21 additions and 19 deletions.
diff --git 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