[oe-commits] Yi Zhao : qtdemo-init: Make qtdemo startup correctly

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: bdd7a07db6b41c6c87c272d410af63c2d0251fc8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bdd7a07db6b41c6c87c272d410af63c2d0251fc8

Author: Yi Zhao <yi.zhao at windriver.com>
Date:   Thu Sep 18 17:05:47 2014 +0800

qtdemo-init: Make qtdemo startup correctly

The qtdemo can't launch via qtdemo-init initscript. Fix it.

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
index 3a1f2cb..21f0273 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
@@ -2,8 +2,8 @@
 
 set -e
 
-if [ -f /usr/bin/qtdemo ]; then
-	QTDEMO="qtdemo > /var/log/Xsession.log 2> &1"
+if [ -x /usr/bin/qtdemo ]; then
+	QTDEMO="qtdemo"
 else
 	QTDEMO="qtdemoE -qws"
 fi
@@ -18,7 +18,7 @@ case "$1" in
 		if [ ! -f /etc/pointercal ]; then
 			/usr/bin/ts_calibrate
 		fi
-		if [ "$QTDEMO" = qtdemo ]; then
+		if [ "$QTDEMO" = "qtdemo" ]; then
 			Xorg &
 			export DISPLAY=:0
 			$QTDEMO &
@@ -26,7 +26,7 @@ case "$1" in
 			QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
 		fi
 	else
-		if [ "$QTDEMO" = qtdemo ]; then
+		if [ "$QTDEMO" = "qtdemo" ]; then
 			Xorg &
 			export DISPLAY=:0
 		fi
@@ -35,7 +35,7 @@ case "$1" in
 	;;
   stop)
 	echo "Stopping qtdemo"
-	if [ "$QTDEMO" = qtdemo ]; then
+	if [ "$QTDEMO" = "qtdemo" ]; then
 		killall Xorg
 		killall qtdemo
 	else