From b442d3fd5305bb3a551200ccb1b8c17e541e9375 Mon Sep 17 00:00:00 2001
From: David Blyth <dblyth@asu.edu>
Date: Mon, 19 Jun 2017 09:31:03 -0500
Subject: [PATCH] Fixed more remnants of copying environment scripts
---
cmake/thisdd4hep_only.csh | 2 +-
cmake/thisdd4hep_only.sh | 11 +++--------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/cmake/thisdd4hep_only.csh b/cmake/thisdd4hep_only.csh
index 38807a4de..425d5f5fb 100644
--- a/cmake/thisdd4hep_only.csh
+++ b/cmake/thisdd4hep_only.csh
@@ -2,7 +2,7 @@
# This version of the script has been modified to set up environment variables for
# only DD4hep.
#
-# This script if for the csh like shells, see thisdd4hep.sh for bash like shells.
+# This script if for the csh like shells, see thisdd4hep_only.sh for bash like shells.
#
# Author: Pere Mato
diff --git a/cmake/thisdd4hep_only.sh b/cmake/thisdd4hep_only.sh
index 5b9ce5f95..d77674164 100644
--- a/cmake/thisdd4hep_only.sh
+++ b/cmake/thisdd4hep_only.sh
@@ -8,23 +8,19 @@
# Author: Pere Mato. F. Gaede, M.Frank
#-------------------------------------------------------------------------------
#
-#echo " ### thisdd4hep.sh: initialize the environment for DD4hep ! "
+#echo " ### thisdd4hep_only.sh: initialize the environment for DD4hep ! "
#
#-----------------------------------------------------------------------------
dd4hep_parse_this() {
package=${2};
if [ "x${1}" = "x" ]; then
- if [ ! -f bin/this${package}.sh ]; then
- echo ERROR: must "cd where/${package}/is" before calling ". bin/this${package}.sh" for this version of bash!;
+ if [ ! -f bin/this${package}_only.sh ]; then
+ echo ERROR: must "cd where/${package}/is" before calling ". bin/this${package}_only.sh" for this version of bash!;
return 1;
fi
THIS="${PWD}";
else
- # get param to "."
THIS=$(dirname $(dirname ${1}));
- #if [ ! -f ${THIS}/bin/this${package}.sh ]; then
- # THIS=$(dirname ${package});
- #fi;
fi;
THIS=$(cd ${THIS} > /dev/null; pwd);
}
@@ -39,7 +35,6 @@ dd4hep_add_path() {
path_value=${path_prefix};
fi;
eval export ${path_name}=${path_value};
- ## echo "dd4hep_add_path: ${path_name}=${path_value}";
}
#-----------------------------------------------------------------------------
dd4hep_add_library_path() {
--
GitLab