From 7027f98302ef3e6bc93742c03f1508258db41a25 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Wed, 5 Nov 2014 17:35:58 +0900 Subject: [PATCH] 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 --- package/emulator-qemu-x86.install.ubuntu-32 | 23 +++++++++++++-------- package/emulator-qemu-x86.install.ubuntu-64 | 22 +++++++++++++------- 2 files changed, 28 insertions(+), 17 deletions(-) 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 -- 2.34.1