Skip to content
Snippets Groups Projects
Commit 3f2caeea authored by Mark OLESEN's avatar Mark OLESEN
Browse files

ENH: do not foamCleanPath on system directories (issue #1102)

- skip /, /bin, /usr/bin ... as potential filters.
parent 537ad464
Branches
Tags
No related merge requests found
...@@ -27,6 +27,7 @@ ...@@ -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<" ...@@ -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
if [ -n "$filter" ] case "$filter" in
then ( / | /bin | /sbin | /lib | /lib64 | /opt \
printDebug "remove>$filter<" | /usr | /usr/bin | /usr/sbin | /usr/lib | /usr/lib64 \
dirList=$(echo "$dirList:" | sed -e "s?${filter}[^:]*:??g") | /usr/local | /usr/local/bin | /usr/local/lib | /usr/local/lib64 )
fi # Do not filter out system directories
printDebug "skip>$filter<"
;;
(*)
if [ -n "$filter" ]
then
printDebug "remove>$filter<"
dirList=$(echo "$dirList:" | sed -e "s?${filter}[^:]*:??g")
fi
;;
esac
done done
printDebug "intermediate>$dirList<" printDebug "intermediate>$dirList<"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment