From: Kitae Kim Date: Thu, 11 Jul 2013 04:58:37 +0000 (+0900) Subject: package: modified install and remove script. X-Git-Tag: 2.2.1_release~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=709ec1e1c4e363d65160c37d084b5c5a14b4761d;p=sdk%2Femulator%2Fqemu.git package: modified install and remove script. Modified those scripts to use TSUDO. Change-Id: I384e894401a695338ecbb255b7b59cb15d399a1c Signed-off-by: Kitae Kim --- diff --git a/package/emulator-qemu-common.remove.ubuntu-32 b/package/emulator-qemu-common.remove.ubuntu-32 deleted file mode 100755 index 26af7354de..0000000000 --- a/package/emulator-qemu-common.remove.ubuntu-32 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` -if [ -z $TIZEN_SDK_INSTALL_PATH ] -then -# echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - exit 2; -fi - -TMP_FILE=remove_tizen-kvm.sh -echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE -echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE -echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE - -chmod +x $TMP_FILE - -GKSUDO=`which gksudo` -if [ "$GKSUDO" = "" ] -then - echo "there is no gksudo." - sudo ./$TMP_FILE -else - gksudo ./$TMP_FILE -fi - -rm $TMP_FILE diff --git a/package/emulator-qemu-common.remove.ubuntu-64 b/package/emulator-qemu-common.remove.ubuntu-64 deleted file mode 100755 index 26af7354de..0000000000 --- a/package/emulator-qemu-common.remove.ubuntu-64 +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` -if [ -z $TIZEN_SDK_INSTALL_PATH ] -then -# echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - exit 2; -fi - -TMP_FILE=remove_tizen-kvm.sh -echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE -echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE -echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE - -chmod +x $TMP_FILE - -GKSUDO=`which gksudo` -if [ "$GKSUDO" = "" ] -then - echo "there is no gksudo." - sudo ./$TMP_FILE -else - gksudo ./$TMP_FILE -fi - -rm $TMP_FILE diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 index e2b45922b0..fc6d5b1d23 100755 --- a/package/emulator-qemu-x86.install.ubuntu-32 +++ b/package/emulator-qemu-x86.install.ubuntu-32 @@ -15,13 +15,18 @@ echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE chmod +x $TMP_FILE -GKSUDO=`which gksudo` -if [ "$GKSUDO" = "" ] +if [ "$TSUDO" != "" ] # since installer v2.27 then - echo "there is no gksudo." - sudo ./$TMP_FILE + $TSUDO ./$TMP_FILE -m "It is required to enable kvm module." else - gksudo ./$TMP_FILE + GKSUDO=`which gksudo` + if [ "$GKSUDO" = "" ] + then + echo "there is no gksudo." + sudo ./$TMP_FILE + else + gksudo ./$TMP_FILE + fi fi rm $TMP_FILE diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 index e2b45922b0..fc6d5b1d23 100755 --- a/package/emulator-qemu-x86.install.ubuntu-64 +++ b/package/emulator-qemu-x86.install.ubuntu-64 @@ -15,13 +15,18 @@ echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE chmod +x $TMP_FILE -GKSUDO=`which gksudo` -if [ "$GKSUDO" = "" ] +if [ "$TSUDO" != "" ] # since installer v2.27 then - echo "there is no gksudo." - sudo ./$TMP_FILE + $TSUDO ./$TMP_FILE -m "It is required to enable kvm module." else - gksudo ./$TMP_FILE + GKSUDO=`which gksudo` + if [ "$GKSUDO" = "" ] + then + echo "there is no gksudo." + sudo ./$TMP_FILE + else + gksudo ./$TMP_FILE + fi fi rm $TMP_FILE diff --git a/package/emulator-qemu-x86.remove.ubuntu-32 b/package/emulator-qemu-x86.remove.ubuntu-32 new file mode 100755 index 0000000000..9f944282ed --- /dev/null +++ b/package/emulator-qemu-x86.remove.ubuntu-32 @@ -0,0 +1,31 @@ +#!/bin/sh + +TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` +if [ -z $TIZEN_SDK_INSTALL_PATH ] +then +# echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log + exit 2; +fi + +TMP_FILE=remove_tizen-kvm.sh +echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE +echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE + +chmod +x $TMP_FILE + +if [ "$TSUDO" != "" ] # since installer v2.27 +then + $TSUDO ./$TMP_FILE -m "It is required to disable kvm module." +else + GKSUDO=`which gksudo` + if [ "$GKSUDO" = "" ] + then + echo "there is no gksudo." + sudo ./$TMP_FILE + else + gksudo ./$TMP_FILE + fi +fi + +rm $TMP_FILE diff --git a/package/emulator-qemu-x86.remove.ubuntu-64 b/package/emulator-qemu-x86.remove.ubuntu-64 new file mode 100755 index 0000000000..9f944282ed --- /dev/null +++ b/package/emulator-qemu-x86.remove.ubuntu-64 @@ -0,0 +1,31 @@ +#!/bin/sh + +TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` +if [ -z $TIZEN_SDK_INSTALL_PATH ] +then +# echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log + exit 2; +fi + +TMP_FILE=remove_tizen-kvm.sh +echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE +echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $TMP_FILE + +chmod +x $TMP_FILE + +if [ "$TSUDO" != "" ] # since installer v2.27 +then + $TSUDO ./$TMP_FILE -m "It is required to disable kvm module." +else + GKSUDO=`which gksudo` + if [ "$GKSUDO" = "" ] + then + echo "there is no gksudo." + sudo ./$TMP_FILE + else + gksudo ./$TMP_FILE + fi +fi + +rm $TMP_FILE