From e17d439f382b40f07aa97c4bbeefac79091b2282 Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Thu, 24 Sep 2015 18:06:37 +0900 Subject: [PATCH] install: modify path for temp files "~/.installmanager" path is using for installer. it can be changed for some reasons. Change-Id: I7bfd78ef52f39aa4e89f13ca6de5dc4f105f2960 Signed-off-by: Munkyu Im --- .../2.4-emulator-qemu-x86.install.macos-64 | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/package/2.4-emulator-qemu-x86.install.macos-64 b/package/2.4-emulator-qemu-x86.install.macos-64 index ead9ae031e..1cd72929e5 100755 --- a/package/2.4-emulator-qemu-x86.install.macos-64 +++ b/package/2.4-emulator-qemu-x86.install.macos-64 @@ -3,12 +3,11 @@ TIZEN_SDK_INSTALL_PATH="`echo $INSTALLED_PATH`" OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax` SYSCTL_FILE=sysctl.conf -TMP_DIR=~/.installmanager COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/bin TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/etc TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc -TMP_FILE=$TMP_DIR/emulator-install.sh +TMP_FILE=emulator-install.sh NEW_SHMMAXSIZE=83886080 if [ -z "$TIZEN_SDK_INSTALL_PATH" ] @@ -26,10 +25,10 @@ function remove_tmp_file { } function remove_sysctl_file { - if [ -e "$TMP_DIR/$SYSCTL_FILE" ] + if [ -e "$SYSCTL_FILE" ] then - echo "delete $TMP_DIR/$SYSCTL_FILE" - rm -f "$TMP_DIR/$SYSCTL_FILE" + echo "delete $SYSCTL_FILE" + rm -f "$SYSCTL_FILE" fi } @@ -38,11 +37,11 @@ function makesysctl { 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" >> "$SYSCTL_FILE" + echo "kern.sysv.shmmin=1" >> "$SYSCTL_FILE" + echo "kern.sysv.shmmni=128" >> "$SYSCTL_FILE" + echo "kern.sysv.shmseg=32" >> "$SYSCTL_FILE" + echo "kern.sysv.shmall=20480" >> "$SYSCTL_FILE" } function generate_tap_kext_cmd { @@ -66,12 +65,12 @@ function generate_sysctl_cmd { then makesysctl; echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> "$TMP_FILE" - echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" + echo "cp -f \"$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE" echo 'echo "Changing /etc/sysctl.conf file. (The original file will be removed to sysctl.conf.old)"' >> "$TMP_FILE" else makesysctl; - echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" + echo "cp -f \"$SYSCTL_FILE\" /etc/." >> "$TMP_FILE" echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE" echo 'echo "Make a new /etc/sysctl.conf file."' >> "$TMP_FILE" fi @@ -139,11 +138,6 @@ EOF function prepare { TAP_ZIP_FILE="$TIZEN_TOOL_ETC_PATH/tap.zip" TAP_KEXT="$TIZEN_TOOL_ETC_PATH/tap.kext" - if [ ! -d "$TMP_DIR" ] - then - echo "make temp directory for emulator install : ( $TMP_DIR )" - mkdir "$TMP_DIR" - fi USER=`id -un` echo "create $TMP_FILE" echo "#!/bin/sh" > "$TMP_FILE" -- 2.34.1