Commit 488d5d79 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix helper scripts

parent 2f03e251
#!/bin/bash
xterm -e "./build-script.sh ; read -p 'Press Enter to close'" || exit 1
# Check if the project works with kazoo. If so, skip all the rest
if [[ -f Makefile && $(grep KAZOO Makefile) != "" ]]
then
xterm -e "make ; read -p 'Press Enter to close'" || exit 1
else
xterm -e "./build-script.sh ; read -p 'Press Enter to close'" || exit 1
fi
......@@ -21,7 +21,7 @@ function quit {
except: pass")
if [ ! -z $tailps ]
then
kill $tailps || xterm -e "echo Internal Error in taste-update-data-view"
kill $tailps 2>&1 || xterm -e "echo Internal Error in taste-update-data-view"
fi
exit $1
}
......
......@@ -27,7 +27,7 @@ function quit {
except: pass")
if [ ! -z $tailps ]
then
kill $tailps || xterm -e "echo Internal Error in taste-update-data-view"
kill $tailps 2>&1 || xterm -e "echo Internal Error in taste-update-data-view"
fi
exit $1
}
......
......@@ -15,12 +15,12 @@ function quit {
except: pass")
if [ ! -z $tailps ]
then
kill $tailps || xterm -e "echo Internal Error in taste-update-data-view"
kill $tailps 2>&1 || xterm -e "echo Internal Error in taste-update-data-view"
fi
exit $1
}
# Install a trap handler to make sure Ctrl-C leads to calling the quit function (trap 2 = SINGINT)
# Install a trap handler to make sure Ctrl-C leads to calling the quit function (trap 2 = SIGINT)
trap 2 quit 1
if [ -t 1 ] ; then
......
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