diff options
author | Jonathan Bauer | 2011-03-08 16:11:39 +0100 |
---|---|---|
committer | Jonathan Bauer | 2011-03-08 16:11:39 +0100 |
commit | 8cd4fd6e23720e7484afee50d60bb86fca7f6f89 (patch) | |
tree | 105d5077cc1877878513e74ecf3a6260896042c6 /src/testApp.sh | |
parent | binPath init fix (diff) | |
download | fbgui-8cd4fd6e23720e7484afee50d60bb86fca7f6f89.tar.gz fbgui-8cd4fd6e23720e7484afee50d60bb86fca7f6f89.tar.xz fbgui-8cd4fd6e23720e7484afee50d60bb86fca7f6f89.zip |
improvements..improvements....
Diffstat (limited to 'src/testApp.sh')
-rwxr-xr-x | src/testApp.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/testApp.sh b/src/testApp.sh index 21308c2..4e80f5a 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -1,12 +1,10 @@ #!/bin/sh -# If an argument is passed (=URL), set the URL. -# If no arg is passed, set the default test URL. -if [ $# = 0 ]; then - url="http://132.230.4.3/test.html" -else - url=$1 -fi - +# Script now simply passes all arguments to the fbgui call. +# Use: ./testApp.sh [OPTIONS] +# OPTIONS: -D, --debug +# -u <url>, --url=<url> +# -d <dir>, --downloaddir=<dir> (dir relative) +# script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")" # to get the path only - not the script name - add @@ -17,7 +15,8 @@ display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') /usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & sleep 0.1 # Start fbgui. -$working_path/fbgui -display QVFb:$display_id -D -u $url +echo "$working_path/fbgui -display QVFb:$display_id $@" +$working_path/fbgui -display QVFb:$display_id $@ # Check if fbbrowser is not running, if so kill the qvfb. if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ] then |