diff options
author | Michael Neves | 2012-01-30 14:24:08 +0100 |
---|---|---|
committer | Michael Neves | 2012-01-30 14:24:08 +0100 |
commit | dbab0ab340880bba7103ba534b824721546299e1 (patch) | |
tree | 548baa166d15a53ab179fb53e4a55a4acf9ad097 /testApp.sh | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/fbgui (diff) | |
download | fbgui-dbab0ab340880bba7103ba534b824721546299e1.tar.gz fbgui-dbab0ab340880bba7103ba534b824721546299e1.tar.xz fbgui-dbab0ab340880bba7103ba534b824721546299e1.zip |
ssl options to fbgui
Diffstat (limited to 'testApp.sh')
-rwxr-xr-x | testApp.sh | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -11,13 +11,10 @@ # -s <path>, --serial=<path> sets path to serial number file # # Note: all path are expected to be absolute. -<<<<<<< HEAD -QT_VERSION=Qt-4.8.0 -======= # # Adapt these to your own system. -QT_VERSION=Qt-4.7.2 -PATH_TO_FBGUI_BUILD=/home/joe/workspace/fbgui +QT_VERSION=Qt-4.8.0 +PATH_TO_FBGUI_BUILD=/home/michael/workspace/fbgui # check if network discovery is activated and if running as root for ARG in $* @@ -29,7 +26,6 @@ if [ "x$ARG" = "x-n" ]; then fi fi done ->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775 # clean /tmp/fbgui [ -d /tmp/fbgui ] && rm -rf /tmp/fbgui @@ -50,10 +46,6 @@ display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') # quick sleep to wait for qvfb loading sleep 0.2 # Start fbgui connecting to QVFb with display_id from above. -<<<<<<< HEAD -$working_path/../workspace/fbgui/src/fbgui/fbgui -display QVFb:$display_id $@ -======= $PATH_TO_FBGUI_BUILD/src/fbgui/fbgui -display QVFb:$display_id $@ -e $PATH_TO_FBGUI_BUILD/src/customdhcpcd/cdhcpcd ->>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775 # kill qvfb since fbgui stopped killall qvfb |