mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: do not foamCleanPath on system directories (issue #1102)
- skip /, /bin, /usr/bin ... as potential filters.
This commit is contained in:
@ -27,6 +27,7 @@
|
|||||||
# - false matches possible when the filter contains '.' (sed regex) etc.
|
# - false matches possible when the filter contains '.' (sed regex) etc.
|
||||||
# - a single composite filter can be passed in. This composite filter
|
# - a single composite filter can be passed in. This composite filter
|
||||||
# is assumed to be delimited by whitespace, colons or semi-colons.
|
# is assumed to be delimited by whitespace, colons or semi-colons.
|
||||||
|
# - will not filter out standard system paths (/usr/bin etc)
|
||||||
#
|
#
|
||||||
# Examples for cleaning the path:
|
# Examples for cleaning the path:
|
||||||
#
|
#
|
||||||
@ -194,11 +195,22 @@ printDebug "input>$dirList<"
|
|||||||
# Apply filters via sed. Path and filter cannot contain '?'.
|
# Apply filters via sed. Path and filter cannot contain '?'.
|
||||||
for filter
|
for filter
|
||||||
do
|
do
|
||||||
|
case "$filter" in
|
||||||
|
( / | /bin | /sbin | /lib | /lib64 | /opt \
|
||||||
|
| /usr | /usr/bin | /usr/sbin | /usr/lib | /usr/lib64 \
|
||||||
|
| /usr/local | /usr/local/bin | /usr/local/lib | /usr/local/lib64 )
|
||||||
|
# Do not filter out system directories
|
||||||
|
printDebug "skip>$filter<"
|
||||||
|
;;
|
||||||
|
|
||||||
|
(*)
|
||||||
if [ -n "$filter" ]
|
if [ -n "$filter" ]
|
||||||
then
|
then
|
||||||
printDebug "remove>$filter<"
|
printDebug "remove>$filter<"
|
||||||
dirList=$(echo "$dirList:" | sed -e "s?${filter}[^:]*:??g")
|
dirList=$(echo "$dirList:" | sed -e "s?${filter}[^:]*:??g")
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
printDebug "intermediate>$dirList<"
|
printDebug "intermediate>$dirList<"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user