Commit 9307a0ab authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
parents 2db256cc f22790f1
...@@ -7,6 +7,7 @@ mkfifo $myfifo ...@@ -7,6 +7,7 @@ mkfifo $myfifo
tail -f $myfifo | taste-progress-dialog.py & tail -f $myfifo | taste-progress-dialog.py &
function quit { function quit {
echo '100 Done' > $myfifo
rm $myfifo rm $myfifo
tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)") tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)")
kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover" kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover"
...@@ -141,6 +142,4 @@ else ...@@ -141,6 +142,4 @@ else
mv "$tempdir"/ConcurrencyView . mv "$tempdir"/ConcurrencyView .
fi fi
echo '100 Done' > $myfifo
quit 0 quit 0
...@@ -9,6 +9,7 @@ mkfifo $myfifo ...@@ -9,6 +9,7 @@ mkfifo $myfifo
tail -f $myfifo | taste-progress-dialog.py & tail -f $myfifo | taste-progress-dialog.py &
function quit { function quit {
echo '100 Done' > $myfifo
rm $myfifo rm $myfifo
tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)") tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)")
kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover" kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover"
...@@ -113,7 +114,6 @@ cp -f __interfaceview-v2.aadl "$INTERFACEVIEW" 2>/dev/null || : ...@@ -113,7 +114,6 @@ cp -f __interfaceview-v2.aadl "$INTERFACEVIEW" 2>/dev/null || :
rm -f "$output_dir"/dataview-uniq.asn "$output_dir"/dataview-uniq.aadl "$output_dir"/dataview-uniq-v1.aadl \ rm -f "$output_dir"/dataview-uniq.asn "$output_dir"/dataview-uniq.aadl "$output_dir"/dataview-uniq-v1.aadl \
"$output_dir"/__interfaceview-v2.aadl "$output_dir"/__interfaceview-v2.aadl
echo '100 Done' > $myfifo
quit $ret quit $ret
......
...@@ -8,6 +8,7 @@ mkfifo $myfifo ...@@ -8,6 +8,7 @@ mkfifo $myfifo
tail -f $myfifo | taste-progress-dialog.py & tail -f $myfifo | taste-progress-dialog.py &
function quit { function quit {
echo '100 Completed' > $myfifo
rm $myfifo rm $myfifo
tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)") tailps=$(pstree -p $$ | grep tail | python -c "import sys, re; print re.search(r'tail\((.*)\)', [x for x in sys.stdin][0]).group(1)")
kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover" kill $tailps || xterm -e "echo Internal Error, unable to kill subprocess. Open a terminal and type 'pkill tail' to (hopefully) recover"
...@@ -93,7 +94,6 @@ DATAVIEW+=" $(taste-config --prefix)/share/taste-types/taste-types.asn" ...@@ -93,7 +94,6 @@ DATAVIEW+=" $(taste-config --prefix)/share/taste-types/taste-types.asn"
#asn2aadlPlus $DATAVIEW "$AADL" -aadlv2 2>&1 | uniq >&2 #asn2aadlPlus $DATAVIEW "$AADL" -aadlv2 2>&1 | uniq >&2
echo '0-100 Updating data view' > $myfifo echo '0-100 Updating data view' > $myfifo
asn2aadlPlus $DATAVIEW "$AADL" -aadlv2 2>&1 > >(uniq >&2) asn2aadlPlus $DATAVIEW "$AADL" -aadlv2 2>&1 > >(uniq >&2)
echo '100 Completed' > $myfifo
if [ "$?" = "1" ] if [ "$?" = "1" ]
then then
......
Subproject commit a551c05c0008f0b348ac55cdd39a98b2b26e9b43 Subproject commit 875d8b92d1bbb54b728d14118a81f2dfb8c0a02b
Markdown is supported
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