From 8ee8b948fc5ab30db4d94890a90e9590e7cd4f71 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.maroneze@cea.fr>
Date: Thu, 18 Jul 2024 17:37:35 +0200
Subject: [PATCH] [dev] rewrite grep usage to allow -e in script
---
dev/make-distrib.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev/make-distrib.sh b/dev/make-distrib.sh
index 2e599b39b4..8d737c5cc4 100755
--- a/dev/make-distrib.sh
+++ b/dev/make-distrib.sh
@@ -21,6 +21,8 @@
# #
##########################################################################
+set -e
+
################################################################################
# Configuration
@@ -290,8 +292,7 @@ $HDRCK -update $MAKE_HEADER_OPT -spec-format="3-fields-by-line" -C "$TMP_DIR/$FR
# Sanity check
if [ "$OPEN_SOURCE" == "yes" ] ; then
- OUT=$(grep -Iir "Contact CEA LIST for licensing." $TMP_DIR | grep -v "headers/" | grep -v "dev/make-distrib.sh")
- if [ "$?" == "0" ]; then
+ if grep -Iir --exclude-dir="headers" --exclude="make-distrib.sh" "Contact CEA LIST for licensing." $TMP_DIR; then
echo "Looks like there are some files containing undetected closed source licences"
exit 1
fi
--
GitLab