diff options
| author | Niklas Goby | 2011-02-22 17:25:05 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-02-22 17:25:05 +0100 |
| commit | db206657c7d89905ed3ede8f1c0b7121a2092236 (patch) | |
| tree | e36afc0a327f163965dc1c926fc23145f1b3c1b8 /src | |
| parent | it is possible to print out the time and a hello world alert. both is emited ... (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/fbgui (diff) | |
| download | fbgui-db206657c7d89905ed3ede8f1c0b7121a2092236.tar.gz fbgui-db206657c7d89905ed3ede8f1c0b7121a2092236.tar.xz fbgui-db206657c7d89905ed3ede8f1c0b7121a2092236.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Diffstat (limited to 'src')
| -rwxr-xr-x | src/testApp.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/testApp.sh b/src/testApp.sh index ccd7cd6..d551248 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -9,14 +9,15 @@ script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")" # to get the path only - not the script name - add working_path=`dirname "$script_path"` +display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') # Start QT's virtual framebuffer -/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 & +/usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & # Wait for it to load (needed?) sleep 1 # Start the fbbrowser app. # This requires the fbgui git repository to be in the user's home directory. -$working_path/fbgui -qws $1 +$working_path/fbgui -qws -display QVFb:$display_id $1 # Check if fbbrowser is not running, if so kill the qvfb. if [ $(ps aux | grep -v grep | grep -c fbgui) -eq 1 ] then |