From: Munkyu Im Date: Tue, 8 Sep 2015 08:14:34 +0000 (+0900) Subject: install: wrap path with double quotes X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~42 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69d7b9e569a2297c4aeed2f7d48f752c25bc6190;p=sdk%2Femulator%2Fqemu.git install: wrap path with double quotes Installation path could includes space character. Change-Id: I8ff79205f6202f0174ef0fd6351212ab9bf46718 Signed-off-by: Munkyu Im --- diff --git a/package/emulator-qemu-common.install.macos-64 b/package/emulator-qemu-common.install.macos-64 index 306e593245..3da1194828 100755 --- a/package/emulator-qemu-common.install.macos-64 +++ b/package/emulator-qemu-common.install.macos-64 @@ -10,64 +10,64 @@ TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin TMP_FILE=$TMP_DIR/setshmmax.sh NEW_SHMMAXSIZE=83886080 -if [ -z $TIZEN_SDK_INSTALL_PATH ] -then - echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log +if [ -z "$TIZEN_SDK_INSTALL_PATH" ] + then + echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log # exit 2; fi function remove_tmp_file { - if [ -e $TMP_FILE ] - then - echo 'delete ~/tmp/setshmmax.sh' - rm -f $TMP_FILE - fi + if [ -e "$TMP_FILE" ] + then + echo 'delete ~/tmp/setshmmax.sh' + rm -f "$TMP_FILE" + fi } -function remove_sysctl_file { - if [ -e $TMP_DIR/$SYSCTL_FILE ] - then - echo 'delete ~/tmp/sysctl.conf' - rm -f $TMP_DIR/$SYSCTL_FILE - fi +function remove_sysctl_file { + if [ -e "$TMP_DIR/$SYSCTL_FILE" ] + then + echo 'delete ~/tmp/sysctl.conf' + rm -f "$TMP_DIR/$SYSCTL_FILE" + fi } function makesysctl { - echo 'make new sysctl.conf file to change' + echo 'make new sysctl.conf file to change' - if [ ! -d $TMP_DIR ] - then - mkdir $TMP_DIR - fi + if [ ! -d "$TMP_DIR" ] + then + mkdir "$TMP_DIR" + fi - remove_sysctl_file; + remove_sysctl_file; - echo "kern.sysv.shmmax=83886080" >> $TMP_DIR/$SYSCTL_FILE - echo "kern.sysv.shmmin=1" >> $TMP_DIR/$SYSCTL_FILE - echo "kern.sysv.shmmni=128" >> $TMP_DIR/$SYSCTL_FILE - echo "kern.sysv.shmseg=32" >> $TMP_DIR/$SYSCTL_FILE - echo "kern.sysv.shmall=20480" >> $TMP_DIR/$SYSCTL_FILE + echo "kern.sysv.shmmax=83886080" >> "$TMP_DIR/$SYSCTL_FILE" + echo "kern.sysv.shmmin=1" >> "$TMP_DIR/$SYSCTL_FILE" + echo "kern.sysv.shmmni=128" >> "$TMP_DIR/$SYSCTL_FILE" + echo "kern.sysv.shmseg=32" >> "$TMP_DIR/$SYSCTL_FILE" + echo "kern.sysv.shmall=20480" >> "$TMP_DIR/$SYSCTL_FILE" } -if [ $OLD_SHMMAXSIZE -lt $NEW_SHMMAXSIZE ] +if [ $OLD_SHMMAXSIZE -lt $NEW_SHMMAXSIZE ] then if [ -e /etc/$SYSCTL_FILE ] then - remove_tmp_file; - makesysctl; - echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> $TMP_FILE - echo "cp -f $TMP_DIR/$SYSCTL_FILE /etc/." >> $TMP_FILE - echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE - chmod +x $TMP_FILE - $TIZEN_BIN_PATH/cocoasudo "--prompt=Changing /etc/sysctl.conf file requires that you type your password.(The original file will be removed to sysctl.conf.old)" sh -x $TMP_FILE + remove_tmp_file; + makesysctl; + echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> "$TMP_FILE" + echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" + echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE" + chmod +x \"$TMP_FILE\" + "$TIZEN_BIN_PATH/cocoasudo" "--prompt=Changing /etc/sysctl.conf file requires that you type your password.(The original file will be removed to sysctl.conf.old)" sh -x "$TMP_FILE" else - remove_tmp_file; - makesysctl; - echo "cp -f $TMP_DIR/$SYSCTL_FILE /etc/." >> $TMP_FILE - echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE - chmod +x $TMP_FILE - $TIZEN_BIN_PATH/cocoasudo "--prompt=Make a new /etc/sysctl.conf file requires that you type your password." sh -x $TMP_FILE + remove_tmp_file; + makesysctl; + echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" + echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE" + chmod +x "$TMP_FILE" + "$TIZEN_BIN_PATH/cocoasudo" "--prompt=Make a new /etc/sysctl.conf file requires that you type your password." sh -x "$TMP_FILE" fi fi @@ -78,7 +78,6 @@ CURRENT_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` if [ ! $OLD_SHMMAXSIZE -eq $CURRENT_SHMMAXSIZE ] then - echo 'need reboot' exit 99 fi diff --git a/package/emulator-qemu-x86.install.ubuntu-32 b/package/emulator-qemu-x86.install.ubuntu-32 index 15eb412f00..ed99ee5c24 100755 --- a/package/emulator-qemu-x86.install.ubuntu-32 +++ b/package/emulator-qemu-x86.install.ubuntu-32 @@ -1,6 +1,6 @@ #!/bin/bash -x -TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi" +TIZEN_KVM_SCRIPT=/etc/init.d/tizen-kvm-multi if [ -f ${TIZEN_KVM_SCRIPT} ] then echo "tizen-kvm-multi does exist. tizen-kvm does not need to be installed." @@ -8,10 +8,10 @@ then fi TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -if [ -z ${TIZEN_SDK_INSTALL_PATH} ] +if [ -z "${TIZEN_SDK_INSTALL_PATH}" ] then # echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - exit 2; + exit 2; fi LSB_RELEASE=`which lsb_release` @@ -31,8 +31,8 @@ echo "Linux Distribution: ${OS_NAME}" TMP_FILE=init_tizen-kvm.sh 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 "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} @@ -44,7 +44,7 @@ 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}" = "" ] diff --git a/package/emulator-qemu-x86.install.ubuntu-64 b/package/emulator-qemu-x86.install.ubuntu-64 index 15eb412f00..ed99ee5c24 100755 --- a/package/emulator-qemu-x86.install.ubuntu-64 +++ b/package/emulator-qemu-x86.install.ubuntu-64 @@ -1,6 +1,6 @@ #!/bin/bash -x -TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi" +TIZEN_KVM_SCRIPT=/etc/init.d/tizen-kvm-multi if [ -f ${TIZEN_KVM_SCRIPT} ] then echo "tizen-kvm-multi does exist. tizen-kvm does not need to be installed." @@ -8,10 +8,10 @@ then fi TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}` -if [ -z ${TIZEN_SDK_INSTALL_PATH} ] +if [ -z "${TIZEN_SDK_INSTALL_PATH}" ] then # echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - exit 2; + exit 2; fi LSB_RELEASE=`which lsb_release` @@ -31,8 +31,8 @@ echo "Linux Distribution: ${OS_NAME}" TMP_FILE=init_tizen-kvm.sh 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 "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} @@ -44,7 +44,7 @@ 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}" = "" ]