From: minkee.lee <minkee.lee@samsung.com>
Date: Wed, 5 Nov 2014 08:35:58 +0000 (+0900)
Subject: Check-gl: Modified install script.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~188
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=538b6ae85ca68b089823df8b038214281cdcda82;p=sdk%2Femulator%2Fqemu.git

Check-gl: Modified install script.

- If install manager is run with CLI, check-gl warning is
  written in log instead of displaying dialog.

Change-Id: Ic052f93eae83d23fdba7b7a2bd96c306c018f00d
Signed-off-by: minkee.lee <minkee.lee@samsung.com>
---

diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32
index cdd09d8193..15eb412f00 100755
--- a/package/emulator-qemu-x86.install.ubuntu-32
+++ b/package/emulator-qemu-x86.install.ubuntu-32
@@ -61,24 +61,29 @@ rm ${TMP_FILE}
 # run check-gl and show pop-up if using gallium driver.
 CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl
 
-showGraphicDriverWarning()
-{
-	zenity --error --no-wrap --text="
-You are using invalid graphic card driver for the emulator.
+GL_WARNING_MSG="You are using invalid graphic card driver for the emulator.
 You have to use the lastest vendor-provided graphic card driver.
 
 For more information, see under ubuntu driver help page.
 https://help.ubuntu.com/community/BinaryDriverHowto/ "
-}
 
+showGraphicDriverWarning()
+{
+	zenity --error --no-wrap --text="
+$GL_WARNING_MSG"
+}
 
 $CHECK_GL_CMD
 RET=$?
 echo "check_gl return : $RET"
 if [ "$RET" = "0" ] ; then
-        echo "check-gl ... OK."
+	echo "check-gl ... OK."
 elif [ "$RET" = "2" ] ; then
-        # show warning dialog
-        echo "check-gl ... fail."
-        showGraphicDriverWarning
+	# show warning dialog
+	echo "check-gl ... fail."
+	if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then
+		showGraphicDriverWarning
+	else
+		echo "Warning : $GL_WARNING_MSG"
+	fi
 fi
diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64
index b796b4b901..15eb412f00 100755
--- a/package/emulator-qemu-x86.install.ubuntu-64
+++ b/package/emulator-qemu-x86.install.ubuntu-64
@@ -61,23 +61,29 @@ rm ${TMP_FILE}
 # run check-gl and show pop-up if using gallium driver.
 CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl
 
-showGraphicDriverWarning()
-{
-        zenity --error --no-wrap --text="
-You are using invalid graphic card driver for the emulator.
+GL_WARNING_MSG="You are using invalid graphic card driver for the emulator.
 You have to use the lastest vendor-provided graphic card driver.
 
 For more information, see under ubuntu driver help page.
 https://help.ubuntu.com/community/BinaryDriverHowto/ "
+
+showGraphicDriverWarning()
+{
+	zenity --error --no-wrap --text="
+$GL_WARNING_MSG"
 }
 
 $CHECK_GL_CMD
 RET=$?
 echo "check_gl return : $RET"
 if [ "$RET" = "0" ] ; then
-        echo "check-gl ... OK."
+	echo "check-gl ... OK."
 elif [ "$RET" = "2" ] ; then
-        # show warning dialog
-        echo "check-gl ... fail."
-        showGraphicDriverWarning
+	# show warning dialog
+	echo "check-gl ... fail."
+	if [ "$INSTALLMANAGER_UI" = "GUI" ] ; then
+		showGraphicDriverWarning
+	else
+		echo "Warning : $GL_WARNING_MSG"
+	fi
 fi