Skip to content
Snippets Groups Projects
Commit 3d16fc6c authored by Mark Hodgkinson's avatar Mark Hodgkinson Committed by Atlas Nightlybuild
Browse files

Merge branch 'GetFilesFix' into 'master'

fixing get_files script to retrieve locally installed files

See merge request atlas/athena!10792

(cherry picked from commit 141422c4 [formerly 1765e506])

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
parent 2faf4c0e
No related branches found
No related tags found
No related merge requests found
#!/bin/sh #!/bin/bash
# #
# get_files [options] [files] [options] [files] ... # get_files [options] [files] [options] [files] ...
# #
...@@ -77,7 +77,10 @@ get_one_file() { ...@@ -77,7 +77,10 @@ get_one_file() {
path_opt=${DATAPATH//:/ } path_opt=${DATAPATH//:/ }
elif [ "$opt" == "scripts" ]; then elif [ "$opt" == "scripts" ]; then
# Only keep PATH entries located in the installation areas to find scripts. # 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 elif [ "$opt" == "xmls" ]; then
path_opt=${XMLPATH//:/ } path_opt=${XMLPATH//:/ }
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment