Executor Beendung mit "wshutdown" command nochmal geändert.
wshutdown ist nicht immer als sondercommand erkannt worden. Damit bleibt der Executor am rennen, und der wait aufruf in EndDispatch kehrt niemals zurück. Durch Patternmatching bei der Auswertung, wird jetzt wshutdown immer erkannt. git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4601 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
0848a1d67d
commit
91c0727129
@ -617,21 +617,16 @@ ExecCommand() {
|
||||
echo "$CMDNUM" >&8
|
||||
while true; do
|
||||
COMMAND=`cat ${CMDF[${CMDNUM}]}`
|
||||
if [ "$COMMAND" == "wshutdown" ]; then
|
||||
rm ${CMDF[${CMDNUM}]}
|
||||
return 0
|
||||
else
|
||||
IFS=";"
|
||||
for i in `echo $COMMAND|awk -F" && " '{print $1";"$2";"$3";"$4";"$5";"$6 }'`; do
|
||||
unset IFS
|
||||
if [[ "$i" == *wshutdown* ]]; then
|
||||
rm ${CMDF[${CMDNUM}]}
|
||||
return 0
|
||||
fi
|
||||
$i
|
||||
IFS=";"
|
||||
for i in `echo $COMMAND|awk -F" && " '{print $1";"$2";"$3";"$4";"$5";"$6 }'`; do
|
||||
unset IFS
|
||||
if [ "$COMMAND" == "wshutdown" ]; then
|
||||
rm ${CMDF[${CMDNUM}]}
|
||||
return 0
|
||||
fi
|
||||
$i
|
||||
IFS=";"
|
||||
done
|
||||
fi
|
||||
done
|
||||
echo "$CMDNUM" >&8
|
||||
done
|
||||
}
|
||||
@ -671,6 +666,7 @@ EndDispatch() {
|
||||
EXECPROCNUM=$NUMCPU
|
||||
while [ ${NUMCMD} -le $EXECPROCNUM ]; do
|
||||
cat >${CMDF[${NUMCMD}]} <<EOF
|
||||
|
||||
wshutdown
|
||||
EOF
|
||||
(( NUMCMD++ ))
|
||||
|
Loading…
Reference in New Issue
Block a user