zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: foamCleanPath problem if path contains @ (closes #264)

Browse Source 
- Can occur with some user names, or mounted paths.
  Resolve by using '?' for the separation character.

  Since '?' is a shell-glob, it is highly unlikely to occur appear in
  filenames.  Additionally, it is not a meta-character in standard sed,
  nor in the GNU extension (which uses '\?').
This commit is contained in:
Mark Olesen
2016-10-18 09:52:37 +02:00
parent fe6ea956f7
commit 03b5d5c108
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/foamCleanPath
View File

@ -99,7 +99,7 @@ IFS=': '
# or may contain ':' separators # or may contain ':' separators
set -- $* set -- $*
# strip out wildcards via sed # Strip out wildcards via sed. Path and wildcard cannot contain '?'.
while [ "$#" -ge 1 ] while [ "$#" -ge 1 ]
do do
wildcard=$1 wildcard=$1
@ -107,7 +107,7 @@ do
##DEBUG echo "remove>$wildcard<" 1>&2 ##DEBUG echo "remove>$wildcard<" 1>&2
if [ -n "$wildcard" ] if [ -n "$wildcard" ]
then then
dirList=$(echo "$dirList:" | sed -e "s@${wildcard}[^:]*:@@g") dirList=$(echo "$dirList:" | sed -e "s?${wildcard}[^:]*:??g")
fi fi
done done

8
bin/tools/doxyFilter
View File

@ -39,15 +39,15 @@
if [ "$#" -gt 0 ] if [ "$#" -gt 0 ]
then then
realFilePath=$(echo $1 | sed -e s@^$WM_PROJECT_DIR@../../..@ ) realFilePath=$(echo "$1" | sed -e "s?^$WM_PROJECT_DIR?../../..?" )
if [ -n "$FOAM_ONLINE_REPO" ] if [ -n "$FOAM_ONLINE_REPO" ]
then then
filePath=$(echo $1 | sed -e s@^$WM_PROJECT_DIR@$FOAM_ONLINE_REPO@ ) filePath=$(echo "$1" | sed -e "s?^$WM_PROJECT_DIR?$FOAM_ONLINE_REPO?" )
else else
filePath=$realFilePath filePath=$realFilePath
fi fi
# dirName=$(echo "$filePath" | sed -e 's@/[^/]*$@@' ) # dirName=$(echo "$filePath" | sed -e 's?/[^/]*$??' )
dirName=${filePath%/[^/]*} dirName=${filePath%/[^/]*}
fileName=${filePath##*/} fileName=${filePath##*/}
@ -62,7 +62,7 @@ then
# ;; # ;;
esac esac
awk -f $WM_PROJECT_DIR/bin/tools/doxyFilter-table.awk $1 | \ awk -f $WM_PROJECT_DIR/bin/tools/doxyFilter-table.awk "$1" | \
awk -f $awkScript | \ awk -f $awkScript | \
sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \ sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \
-e s@%realFilePath%@$realFilePath@g \ -e s@%realFilePath%@$realFilePath@g \