---
scripts/emc.in | 17 +++++++++++++----
scripts/halrun.in | 10 ++++++++--
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/scripts/emc.in b/scripts/emc.in
index d781605..41c5441 100644
--- a/scripts/emc.in
+++ b/scripts/emc.in
@@ -581,10 +581,19 @@ fi
NUM=1
CFGFILE=`$INIVAR -ini "$INIFILE" -var HALFILE -sec HAL -num $NUM 2> /dev/null`
while [ -n "$CFGFILE" ] ; do
- if ! $HALCMD -i "$INIFILE" -f $CFGFILE && [ "$DASHK" = "" ]; then
- Cleanup
- exit -1
- fi
+ case $CFGFILE in
+ *.tcl)
+ if ! haltcl -ini "$INIFILE" $CFGFILE && [ "$DASHK" = "" ]; then
+ Cleanup
+ exit -1
+ fi
+ ;;
+ *)
+ if ! $HALCMD -i "$INIFILE" -f $CFGFILE && [ "$DASHK" = "" ]; then
+ Cleanup
+ exit -1
+ fi
+ esac
# get next config file name from ini file
NUM=$(($NUM+1))
CFGFILE=`$INIVAR -ini "$INIFILE" -var HALFILE -sec HAL -num $NUM 2>
/dev/null`
diff --git a/scripts/halrun.in b/scripts/halrun.in
index ab9d406..66b20ee 100644
--- a/scripts/halrun.in
+++ b/scripts/halrun.in
@@ -19,13 +19,19 @@ if $REALTIME status > /dev/null; then
exit 1
fi
+IS_HALTCL=false
case $1 in
-*.hal) set -- -f $1
+*.tcl) IS_HALTCL=true ;;
+*.hal) set -- -f $1 ;;
esac
$REALTIME start
-halcmd $@; result=$?
+if $IS_HALTCL; then
+ haltcl $@; result=$?
+else
+ halcmd $@; result=$?
+fi
if [ $INTERACTIVE -eq 1 ]; then halcmd -kf; fi
--
1.6.2.1.469.gdffc
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers
