From 3d16fc6c01c9623dff537ae259a635d72022ea3b Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Mon, 30 Apr 2018 08:37:52 +0000
Subject: [PATCH] Merge branch 'GetFilesFix' into 'master'
fixing get_files script to retrieve locally installed files
See merge request atlas/athena!10792
(cherry picked from commit 141422c40df517a0515dab70c63ee7767b580e66 [formerly 1765e50609b8d1a1f61a12fcfa6fcb9aa10eab4b])
21544891 fixing get_files script to retrieve locally installed files
24b01702 changing /bin/sh to /bin/bash on advice of shifter
Former-commit-id: a4fcdc2ca831d7c47c090ed1ea2d45dc7026ba3c
---
Tools/Scripts/share/get_files | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Tools/Scripts/share/get_files b/Tools/Scripts/share/get_files
index 1ccf16a931c..1aa0c187788 100755
--- a/Tools/Scripts/share/get_files
+++ b/Tools/Scripts/share/get_files
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# get_files [options] [files] [options] [files] ...
#
@@ -77,7 +77,10 @@ get_one_file() {
path_opt=${DATAPATH//:/ }
elif [ "$opt" == "scripts" ]; then
# Only keep PATH entries located in the installation areas to find scripts.
- path_opt=$(echo -e ${PATH//:/'\n'} | fgrep /InstallArea/)
+ path_opt=""
+ for binpath in $(echo -e ${CMAKE_PREFIX_PATH//:/ }); do
+ path_opt="${path_opt}$binpath/bin $binpath/share "
+ done
elif [ "$opt" == "xmls" ]; then
path_opt=${XMLPATH//:/ }
fi
--
GitLab