diff options
Diffstat (limited to 'src/testApp.sh')
-rwxr-xr-x | src/testApp.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/testApp.sh b/src/testApp.sh index 81093d7..3949361 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -1,5 +1,6 @@ #!/bin/sh -# This script now needs to have the URL to load as an argument. +# If an argument is passed (=URL), set the URL. +# If no arg are passed, set the default test URL. if [ $# = 0 ]; then url="http://132.230.4.3/webkitTest.html" else @@ -12,15 +13,12 @@ script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")" working_path=`dirname "$script_path"` display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') -# Start QT's virtual framebuffer +# Start QT's virtual framebuffer with proper displayID /usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & -# Wait for it to load (needed?) +# Wait for it to load (needed?) Probably not ;o sleep 1 -# Start the fbbrowser app. -# This requires the fbgui git repository to be in the user's home directory. -echo "fbgui call:" -echo "$working_path/fbgui -qws -display QVFb:$display_id -u $url" -$working_path/fbgui -qws -display QVFb:$display_id --url=$url +# Start fbgui. +$working_path/fbgui -display QVFb:$display_id --url=$url # Check if fbbrowser is not running, if so kill the qvfb. if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ] then |