From 59fadab4700ef0649089bd0ceef06868a5d8466e Mon Sep 17 00:00:00 2001
From: Ole Hansen <ole@jlab.org>
Date: Mon, 16 Nov 2020 17:11:30 -0500
Subject: [PATCH] thisdd4hep.sh: Handle whitespace in to-be-added paths
---
cmake/thisdd4hep.sh | 2 +-
cmake/thisdd4hep_only.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index 35d09971f..2ceadc4d5 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -35,7 +35,7 @@ dd4hep_add_path() {
path_prefix=${2}
eval path_value=\$$path_name
# Prevent duplicates
- path_value=`echo ${path_value} | tr : '\n' | grep -v ${path_prefix} | tr '\n' : | sed 's|:$||'`
+ path_value=`echo ${path_value} | tr : '\n' | grep -v "${path_prefix}" | tr '\n' : | sed 's|:$||'`
path_value="${path_prefix}${path_value:+:${path_value}}"
eval export ${path_name}='${path_value}'
unset path_name path_prefix path_value
diff --git a/cmake/thisdd4hep_only.sh b/cmake/thisdd4hep_only.sh
index 3f6314a6c..81fae3094 100644
--- a/cmake/thisdd4hep_only.sh
+++ b/cmake/thisdd4hep_only.sh
@@ -37,7 +37,7 @@ dd4hep_add_path() {
path_prefix=${2}
eval path_value=\$$path_name
# Prevent duplicates
- path_value=`echo ${path_value} | tr : '\n' | grep -v ${path_prefix} | tr '\n' : | sed 's|:$||'`
+ path_value=`echo ${path_value} | tr : '\n' | grep -v "${path_prefix}" | tr '\n' : | sed 's|:$||'`
path_value="${path_prefix}${path_value:+:${path_value}}"
eval export ${path_name}='${path_value}'
unset path_name path_prefix path_value
--
GitLab