diff options
Diffstat (limited to 'testApp.sh')
| -rwxr-xr-x | testApp.sh | 23 |
1 files changed, 23 insertions, 0 deletions
@@ -11,10 +11,29 @@ # -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 + +# check if network discovery is activated and if running as root +for ARG in $* +do +if [ "x$ARG" = "x-n" ]; then + if [ $(whoami) != "root" ]; then + echo "Network Discovery activated, you need to be root." + exit 1; + fi +fi +done +>>>>>>> 2abf1cec73371fb4a97a078a47f521d23fbf0775 # clean /tmp/fbgui [ -d /tmp/fbgui ] && rm -rf /tmp/fbgui +[ -f /tmp/fbgui.log ] && rm /tmp/fbgui.log [ -f /tmp/fbgui_trigger ] && rm /tmp/fbgui_trigger # path to script (including script name) @@ -31,6 +50,10 @@ 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 |