From 055db252e64e0fa83422f3a476dcccd07c2c23f8 Mon Sep 17 00:00:00 2001
From: Kitae Kim <kt920.kim@samsung.com>
Date: Tue, 6 Aug 2013 13:44:46 +0900
Subject: [PATCH] package: modified install and remove script on ubuntu.

The routine to check linux distribution using /etc/release is wrong,
because the file can be not included as default.
Therefore, lsb_release, which print LSB(Linux Standard Base)
and distribution information, should be used in these script.

Change-Id: I14d953df76e6f01eaabdde5e87de53e943e7130f
Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
---
 package/emulator-qemu-x86.install.ubuntu-32 | 42 ++++++++++++++++++-----------
 package/emulator-qemu-x86.install.ubuntu-64 | 42 ++++++++++++++++++-----------
 package/emulator-qemu-x86.remove.ubuntu-32  | 40 +++++++++++++++++----------
 package/emulator-qemu-x86.remove.ubuntu-64  | 40 +++++++++++++++++----------
 4 files changed, 106 insertions(+), 58 deletions(-)

diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32
index d84e1dc..66b5a3b 100755
--- a/package/emulator-qemu-x86.install.ubuntu-32
+++ b/package/emulator-qemu-x86.install.ubuntu-32
@@ -1,40 +1,52 @@
 #!/bin/bash -ex
 
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
+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
 
-if [ -e /etc/os-release ]; then
-	OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+LSB_RELEASE=`which lsb_release`
+if [ "${LSB_RELEASE}" = "" ]; then
+	if [ -e /etc/os-release ]; then
+		OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+	fi
+	# TODO: Detect other linux distributions.
+else
+	OS_NAME=`lsb_release --id --short`
+fi
+
+if [ ! -z "${OS_NAME}" ]; then
+	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
+echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=init_tizen-kvm.sh
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
-echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
+echo "#!/bin/bash -ex" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
+echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
+	echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
 fi
 
-chmod +x $TMP_FILE
+chmod +x ${TMP_FILE}
 
-if [ "$TSUDO" != "" ] # since installer v2.27
+if [ "${TSUDO}" != "" ] # since installer v2.27
 then
 	TSUDO_MSG="Enter your password to enable kvm module if your machine supports hardware virtualization."
 	TMP_PATH="`pwd`/${TMP_FILE}"
-	$TSUDO -m "${TSUDO_MSG}" sh $TMP_PATH
+	${TSUDO} -m "${TSUDO_MSG}" sh ${TMP_PATH}
 else
 	GKSUDO=`which gksudo`
-	if [ "$GKSUDO" = "" ]
+	if [ "${GKSUDO}" = "" ]
 	then
 		echo "there is no gksudo."
-		sudo ./$TMP_FILE
+		sudo ./${TMP_FILE}
 	else
-		gksudo ./$TMP_FILE
+		gksudo ./${TMP_FILE}
 	fi
 fi
 
-rm $TMP_FILE
+rm ${TMP_FILE}
diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64
index d84e1dc..66b5a3b 100755
--- a/package/emulator-qemu-x86.install.ubuntu-64
+++ b/package/emulator-qemu-x86.install.ubuntu-64
@@ -1,40 +1,52 @@
 #!/bin/bash -ex
 
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
+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
 
-if [ -e /etc/os-release ]; then
-	OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+LSB_RELEASE=`which lsb_release`
+if [ "${LSB_RELEASE}" = "" ]; then
+	if [ -e /etc/os-release ]; then
+		OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+	fi
+	# TODO: Detect other linux distributions.
+else
+	OS_NAME=`lsb_release --id --short`
+fi
+
+if [ ! -z "${OS_NAME}" ]; then
+	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
+echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=init_tizen-kvm.sh
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> $TMP_FILE
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> $TMP_FILE
-echo "/etc/init.d/tizen-kvm start" >> $TMP_FILE
+echo "#!/bin/bash -ex" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
+echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d tizen-kvm defaults" >> $TMP_FILE
+	echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
 fi
 
-chmod +x $TMP_FILE
+chmod +x ${TMP_FILE}
 
-if [ "$TSUDO" != "" ] # since installer v2.27
+if [ "${TSUDO}" != "" ] # since installer v2.27
 then
 	TSUDO_MSG="Enter your password to enable kvm module if your machine supports hardware virtualization."
 	TMP_PATH="`pwd`/${TMP_FILE}"
-	$TSUDO -m "${TSUDO_MSG}" sh $TMP_PATH
+	${TSUDO} -m "${TSUDO_MSG}" sh ${TMP_PATH}
 else
 	GKSUDO=`which gksudo`
-	if [ "$GKSUDO" = "" ]
+	if [ "${GKSUDO}" = "" ]
 	then
 		echo "there is no gksudo."
-		sudo ./$TMP_FILE
+		sudo ./${TMP_FILE}
 	else
-		gksudo ./$TMP_FILE
+		gksudo ./${TMP_FILE}
 	fi
 fi
 
-rm $TMP_FILE
+rm ${TMP_FILE}
diff --git a/package/emulator-qemu-x86.remove.ubuntu-32 b/package/emulator-qemu-x86.remove.ubuntu-32
index 05e72fe..f94faaf 100755
--- a/package/emulator-qemu-x86.remove.ubuntu-32
+++ b/package/emulator-qemu-x86.remove.ubuntu-32
@@ -1,39 +1,51 @@
 #!/bin/bash -ex
 
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
+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
 
-if [ -e /etc/os-release ]; then
-	OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+LSB_RELEASE=`which lsb_release`
+if [ "${LSB_RELEASE}" = "" ]; then
+	if [ -e /etc/os-release ]; then
+		OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+	fi
+	# TODO: Detect other linux distributions.
+else
+	OS_NAME=`lsb_release --id --short`
+fi
+
+if [ ! -z "${OS_NAME}" ]; then
+	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
+echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=remove_tizen-kvm.sh
+echo "#!/bin/bash -ex" >> ${TMP_FILE}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE
+	echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
 fi
-echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE
-echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $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
+chmod +x ${TMP_FILE}
 
-if [ "$TSUDO" != "" ] # since installer v2.27
+if [ "${TSUDO}" != "" ] # since installer v2.27
 then
 	TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
 	TMP_PATH="`pwd`/${TMP_FILE}"
-	$TSUDO -m "${TSUDO_MSG}" sh $TMP_PATH
+	$TSUDO -m "${TSUDO_MSG}" sh ${TMP_PATH}
 else
 	GKSUDO=`which gksudo`
-	if [ "$GKSUDO" = "" ]
+	if [ "${GKSUDO}" = "" ]
 	then
 		echo "there is no gksudo."
-		sudo ./$TMP_FILE
+		sudo ./${TMP_FILE}
 	else
-		gksudo ./$TMP_FILE
+		gksudo ./${TMP_FILE}
 	fi
 fi
 
-rm $TMP_FILE
+rm ${TMP_FILE}
diff --git a/package/emulator-qemu-x86.remove.ubuntu-64 b/package/emulator-qemu-x86.remove.ubuntu-64
index 05e72fe..f94faaf 100755
--- a/package/emulator-qemu-x86.remove.ubuntu-64
+++ b/package/emulator-qemu-x86.remove.ubuntu-64
@@ -1,39 +1,51 @@
 #!/bin/bash -ex
 
-TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
-if [ -z $TIZEN_SDK_INSTALL_PATH ]
+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
 
-if [ -e /etc/os-release ]; then
-	OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+LSB_RELEASE=`which lsb_release`
+if [ "${LSB_RELEASE}" = "" ]; then
+	if [ -e /etc/os-release ]; then
+		OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
+	fi
+	# TODO: Detect other linux distributions.
+else
+	OS_NAME=`lsb_release --id --short`
+fi
+
+if [ ! -z "${OS_NAME}" ]; then
+	OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 fi
+echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=remove_tizen-kvm.sh
+echo "#!/bin/bash -ex" >> ${TMP_FILE}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
-	echo "update-rc.d -f tizen-kvm remove" >> $TMP_FILE
+	echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
 fi
-echo "rm -f /etc/init.d/tizen-kvm" >> $TMP_FILE
-echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> $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
+chmod +x ${TMP_FILE}
 
-if [ "$TSUDO" != "" ] # since installer v2.27
+if [ "${TSUDO}" != "" ] # since installer v2.27
 then
 	TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
 	TMP_PATH="`pwd`/${TMP_FILE}"
-	$TSUDO -m "${TSUDO_MSG}" sh $TMP_PATH
+	$TSUDO -m "${TSUDO_MSG}" sh ${TMP_PATH}
 else
 	GKSUDO=`which gksudo`
-	if [ "$GKSUDO" = "" ]
+	if [ "${GKSUDO}" = "" ]
 	then
 		echo "there is no gksudo."
-		sudo ./$TMP_FILE
+		sudo ./${TMP_FILE}
 	else
-		gksudo ./$TMP_FILE
+		gksudo ./${TMP_FILE}
 	fi
 fi
 
-rm $TMP_FILE
+rm ${TMP_FILE}
-- 
2.7.4