From cc574d0b2e4ec1ae20c54d64867c8689c141a1c0 Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Fri, 8 May 2015 19:17:29 +0900 Subject: [PATCH] install: bash script should be launched with "bash" command in some case, bash command has been launched with "sh" command. Change-Id: I0adcfe20b0261368b2ae3d2527e59fdab576ee14 Signed-off-by: Munkyu Im --- package/emulator-qemu-x86.install.macos-64 | 4 ++-- package/emulator-qemu-x86.install.ubuntu-32 | 6 +++--- package/emulator-qemu-x86.install.ubuntu-64 | 6 +++--- package/emulator-qemu-x86.remove.ubuntu-32 | 2 +- package/emulator-qemu-x86.remove.ubuntu-64 | 2 +- tizen/src/Makefile | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/emulator-qemu-x86.install.macos-64 b/package/emulator-qemu-x86.install.macos-64 index 0107309b56..2e20ea5e6b 100755 --- a/package/emulator-qemu-x86.install.macos-64 +++ b/package/emulator-qemu-x86.install.macos-64 @@ -142,7 +142,7 @@ function prepare { fi USER=`id -un` echo "create $TMP_FILE" - echo "#!/bin/sh" > $TMP_FILE + echo "#!/bin/bash" > $TMP_FILE echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> $TMP_FILE echo "USER=$USER" >> $TMP_FILE @@ -156,7 +156,7 @@ function generate { function execute { /bin/chmod +x $TMP_FILE - $TIZEN_BIN_PATH/cocoasudo "--prompt=Please enter your password to install tizen emulator." sh -x $TMP_FILE + $TIZEN_BIN_PATH/cocoasudo "--prompt=Please enter your password to install tizen emulator." bash -x $TMP_FILE } function cleanup { diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 index 226c6990b8..7ff4d0a4c0 100755 --- a/package/emulator-qemu-x86.install.ubuntu-32 +++ b/package/emulator-qemu-x86.install.ubuntu-32 @@ -105,15 +105,15 @@ if [ "${TSUDO}" != "" ] # since installer v2.27 then TSUDO_MSG="Enter your password to install Tizen Emulator" TMP_PATH="`pwd`/${TMP_FILE}" - ${TSUDO} -m "${TSUDO_MSG}" sh ${TMP_PATH} + ${TSUDO} -m "${TSUDO_MSG}" bash -x ${TMP_PATH} else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] then echo "there is no gksudo." - sudo ./${TMP_FILE} + sudo bash -x ./${TMP_FILE} else - gksudo ./${TMP_FILE} + gksudo bash -x ./${TMP_FILE} fi fi diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 index 226c6990b8..7ff4d0a4c0 100755 --- a/package/emulator-qemu-x86.install.ubuntu-64 +++ b/package/emulator-qemu-x86.install.ubuntu-64 @@ -105,15 +105,15 @@ if [ "${TSUDO}" != "" ] # since installer v2.27 then TSUDO_MSG="Enter your password to install Tizen Emulator" TMP_PATH="`pwd`/${TMP_FILE}" - ${TSUDO} -m "${TSUDO_MSG}" sh ${TMP_PATH} + ${TSUDO} -m "${TSUDO_MSG}" bash -x ${TMP_PATH} else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] then echo "there is no gksudo." - sudo ./${TMP_FILE} + sudo bash -x ./${TMP_FILE} else - gksudo ./${TMP_FILE} + gksudo bash -x ./${TMP_FILE} fi fi diff --git a/package/emulator-qemu-x86.remove.ubuntu-32 b/package/emulator-qemu-x86.remove.ubuntu-32 index d40b9f10a5..ed7e7ef62e 100755 --- a/package/emulator-qemu-x86.remove.ubuntu-32 +++ b/package/emulator-qemu-x86.remove.ubuntu-32 @@ -43,7 +43,7 @@ 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}" bash ${TMP_PATH} else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] diff --git a/package/emulator-qemu-x86.remove.ubuntu-64 b/package/emulator-qemu-x86.remove.ubuntu-64 index d40b9f10a5..ed7e7ef62e 100755 --- a/package/emulator-qemu-x86.remove.ubuntu-64 +++ b/package/emulator-qemu-x86.remove.ubuntu-64 @@ -43,7 +43,7 @@ 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}" bash ${TMP_PATH} else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] diff --git a/tizen/src/Makefile b/tizen/src/Makefile index faf13a46cc..6752f9dd8a 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -325,10 +325,10 @@ endif # for bridged network ifdef CONFIG_LINUX - cp -pP scripts/emulator-ifup-linux.sh $(DIBS_COMMON_DIR)/etc/emulator-ifup.sh + cp -pP scripts/emulator-ifup-linux.sh $(DIBS_X86_DIR)/etc/emulator-ifup.sh endif ifdef CONFIG_DARWIN - cp -pP scripts/emulator-ifup-darwin.sh $(DIBS_COMMON_DIR)/etc/emulator-ifup.sh + cp -pP scripts/emulator-ifup-darwin.sh $(DIBS_X86_DIR)/etc/emulator-ifup.sh endif ifdef CONFIG_WIN32 cp -pP scripts/tap-uninstall.bat $(DIBS_COMMON_DIR)/bin -- 2.34.1