Revision: 41606
http://brlcad.svn.sourceforge.net/brlcad/?rev=41606&view=rev
Author: brlcad
Date: 2010-12-14 22:01:40 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
er, those unrecognized option names are probably .g file names, so leave them
there. search . -maxdepth doesn't work, so don't mention getting only
top-level objects. quote the eval commands for good measure.
Modified Paths:
--------------
brlcad/trunk/sh/conversion.sh
Modified: brlcad/trunk/sh/conversion.sh
===================================================================
--- brlcad/trunk/sh/conversion.sh 2010-12-14 21:33:18 UTC (rev 41605)
+++ brlcad/trunk/sh/conversion.sh 2010-12-14 22:01:40 UTC (rev 41606)
@@ -176,7 +176,8 @@
fi
;;
x*)
- echo "Ignoring unrecognized option [$arg]"
+ # should be geometry database files, so stop
+ break
;;
esac
shift
@@ -232,7 +233,6 @@
OBJECTS="-type region" # only convert regions
OBJECTS="-not -type comb" # only convert primitives
-OBJECTS="-depth=0" # only convert top-level objects
The MAXTIME option specifies how many seconds are allowed to elapse
before the conversion is aborted. Some conversions can take days or
@@ -386,11 +386,11 @@
work="${file}.conversion"
cmd="cp \"$file\" \"$work\""
$VERBOSE_ECHO "\$ $cmd"
- eval $cmd
+ eval "$cmd"
# execute in a coprocess
cmd="$SEARCH -c \"$work\" search . $OBJECTS"
- objects=`eval $cmd 2>&1 | grep -v Using`
+ objects=`eval "$cmd" 2>&1 | grep -v Using`
$VERBOSE_ECHO "\$ $cmd"
$VERBOSE_ECHO "$objects"
@@ -425,7 +425,7 @@
nmg=fail
cmd="$GED -c "$work" facetize -n \"${obj}.nmg\" \"${obj}\""
$VERBOSE_ECHO "\$ $cmd"
- output=`eval time $cmd 2>&1 | grep -v Using`
+ output=`eval time "$cmd" 2>&1 | grep -v Using`
# stop the limit timer. when we get here, see if there is a
# sleep process still running. if any found, the sleep
@@ -464,7 +464,7 @@
bot=fail
cmd="$GED -c "$work" facetize \"${obj}.bot\" \"${obj}\""
$VERBOSE_ECHO "\$ $cmd"
- output=`eval time $cmd 2>&1 | grep -v Using`
+ output=`eval time "$cmd" 2>&1 | grep -v Using`
# stop the limit timer, same as above.
for pid in `ps xj | grep $spid | grep sleep | grep -v grep | awk
'{print $2}'` ; do
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
