Commit 8e5e4180 authored by Mark OLESEN's avatar Mark OLESEN Committed by Andrew Heather
Browse files

ENH: foamGetDict avoids overwrite of existing files (-force to override)

parent 5d8e8610
......@@ -45,6 +45,7 @@ options:
-case <dir> Alternative case directory, default is the cwd
-ext <ext> File extension
-cfg Same as '-e cfg' for '.cfg' files
-f | -force Force overwrite of existing files
-no-ext Files without extension
-target <dir> Target directory (default: system, or auto-detected)
-with-api=NUM Alternative api value for searching
......@@ -86,7 +87,7 @@ projectApi="$FOAM_API"
#-------------------------------------------------------------------------------
searchExt="<any>"
unset targetDir
unset targetDir optForce
while [ "$#" -gt 0 ]
do
......@@ -113,6 +114,9 @@ do
-cfg)
searchExt="cfg"
;;
-f | -force)
optForce=true
;;
-target)
[ "$#" -ge 2 ] || die "'$1' option requires an argument"
targetDir="$2"
......@@ -221,12 +225,27 @@ findFiles()
}
# Slightly dressed up version of 'cp -v'
# Slightly dressed up version of 'cp -v' that does not clobber existing files
copyFile()
{
local targetFile="$2"
[ -d "$2" ] && targetFile="$targetFile/${1##*/}"
echo 1>&2
echo "Copying $1 to $2" 1>&2
\cp "$1" "$2"
if [ -f "$targetFile" ]
then
if [ "$optForce" = true ]
then
echo "Overwrite $1 to $2" 1>&2
\cp "$1" "$2"
else
echo "Skip copy $1 to $2" 1>&2
fi
else
echo "Copying $1 to $2" 1>&2
\cp "$1" "$2"
fi
echo 1>&2
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment