From 27a7a176fe60939aa2068a3ffe6d657a28220a4f Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Mon, 7 Sep 2015 15:52:39 +0900 Subject: [PATCH] install: wrap path with double quotes Change-Id: I1e461a48605737dafa6dc0d2a0f0b4decbbb2247 Signed-off-by: Munkyu Im --- .../2.3-emulator-qemu-common.install.macos-64 | 47 +++++++++---------- .../2.3-emulator-qemu-x86.install.ubuntu-32 | 8 ++-- .../2.3-emulator-qemu-x86.install.ubuntu-64 | 8 ++-- .../2.3-emulator-qemu-x86.remove.ubuntu-32 | 4 +- .../2.3-emulator-qemu-x86.remove.ubuntu-64 | 4 +- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/package/2.3-emulator-qemu-common.install.macos-64 b/package/2.3-emulator-qemu-common.install.macos-64 index 306e593245..236b924084 100755 --- a/package/2.3-emulator-qemu-common.install.macos-64 +++ b/package/2.3-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 ] +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 ] + if [ -e "$TMP_FILE" ] then echo 'delete ~/tmp/setshmmax.sh' - rm -f $TMP_FILE + rm -f "$TMP_FILE" fi } -function remove_sysctl_file { - if [ -e $TMP_DIR/$SYSCTL_FILE ] +function remove_sysctl_file { + if [ -e "$TMP_DIR/$SYSCTL_FILE" ] then echo 'delete ~/tmp/sysctl.conf' - rm -f $TMP_DIR/$SYSCTL_FILE + rm -f "$TMP_DIR/$SYSCTL_FILE" fi } function makesysctl { echo 'make new sysctl.conf file to change' - if [ ! -d $TMP_DIR ] + if [ ! -d "$TMP_DIR" ] then - mkdir $TMP_DIR + mkdir "$TMP_DIR" fi 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 + 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 + 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/2.3-emulator-qemu-x86.install.ubuntu-32 b/package/2.3-emulator-qemu-x86.install.ubuntu-32 index d490948b9d..945bfc862d 100755 --- a/package/2.3-emulator-qemu-x86.install.ubuntu-32 +++ b/package/2.3-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,13 +8,13 @@ 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; fi -PLATFORM_VERSION="tizen-2.3" +PLATFORM_VERSION=tizen-2.3 LSB_RELEASE=`which lsb_release` if [ "${LSB_RELEASE}" = "" ]; then @@ -46,7 +46,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/2.3-emulator-qemu-x86.install.ubuntu-64 b/package/2.3-emulator-qemu-x86.install.ubuntu-64 index d490948b9d..945bfc862d 100755 --- a/package/2.3-emulator-qemu-x86.install.ubuntu-64 +++ b/package/2.3-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,13 +8,13 @@ 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; fi -PLATFORM_VERSION="tizen-2.3" +PLATFORM_VERSION=tizen-2.3 LSB_RELEASE=`which lsb_release` if [ "${LSB_RELEASE}" = "" ]; then @@ -46,7 +46,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/2.3-emulator-qemu-x86.remove.ubuntu-32 b/package/2.3-emulator-qemu-x86.remove.ubuntu-32 index d40b9f10a5..32f7f442de 100755 --- a/package/2.3-emulator-qemu-x86.remove.ubuntu-32 +++ b/package/2.3-emulator-qemu-x86.remove.ubuntu-32 @@ -8,7 +8,7 @@ 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; @@ -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}" sh "${TMP_PATH}" else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] diff --git a/package/2.3-emulator-qemu-x86.remove.ubuntu-64 b/package/2.3-emulator-qemu-x86.remove.ubuntu-64 index d40b9f10a5..32f7f442de 100755 --- a/package/2.3-emulator-qemu-x86.remove.ubuntu-64 +++ b/package/2.3-emulator-qemu-x86.remove.ubuntu-64 @@ -8,7 +8,7 @@ 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; @@ -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}" sh "${TMP_PATH}" else GKSUDO=`which gksudo` if [ "${GKSUDO}" = "" ] -- 2.34.1