[Title] modify install script (change tizensdkpath file location)

[Type] bug fix
[Module] emulator image
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/emulator-image-2.0-x86.install.linux b/package/emulator-image-2.0-x86.install.linux
index 4da514d..15f2a91 100755 (executable)
--- a/package/emulator-image-2.0-x86.install.linux
+++ b/package/emulator-image-2.0-x86.install.linux
@@ -24,37 +24,37 @@ fi
 #= find recent workspace =======================================================================
 workspace=$vms_path
 resent=`awk -F= '$1 == "RECENT_VMS_PATH" {name=$2; print name}' "$HOME/tizen-sdk-data/.tizen-vms-path"`
-if [ ${resent} -ne 0 ];
+if [ ${resent} != "" ];
 then
        echo "RECENT_VMS_PATH = "$resent
-       workspace=$resent/x86
+       workspace=$resent/vms
 fi
 echo "WORKING_VMS_PATH = "$workspace
 
 #= find base image version ======================================================================
-config_path="${HOME}/.TizenSDK/tizensdkpath"
+config_path="${HOME}/tizen-sdk-data/tizensdkpath"
 sdk_path=`awk -F= '$1 == "TIZEN_SDK_INSTALLED_PATH" {name=$2; print name}' "$config_path"`
 
 if [ -e "$sdk_path/platforms/tmp.ini" ];
 then
-       image_ver=`cat $sdk_path/platforms/tmp.ini`
-       image_ver="base="\"$image_ver\"
+       image_name=`cat $sdk_path/platforms/tmp.ini`
+       image_name="base="\"$image_name\"
        rm -r -f "$sdk_path/platforms/tmp.ini"
 else
-       image_ver="type=\"standard\""
+       image_name="type=\"standard\""
 fi
-echo "BASE_IMAGE_VERSION = "$image_ver
+echo "BASE_IMAGE_VERSION = "$image_name
 #==================================================================================================
 
 for file in `ls $workspace`
 do
        if [ -e "$workspace/$file/vm_config.xml" ];
        then
-               grep $image_ver "$workspace/$file/vm_config.xml"
+               grep $image_name "$workspace/$file/vm_config.xml"
                if [ $? -eq 0 ];
                then
                        rm -r -f $workspace/$file
                fi
        fi
 done
-
+echo "DONE"

diff --git a/package/emulator-image-2.0-x86.install.windows b/package/emulator-image-2.0-x86.install.windows
index dd14c5a..82a6455 100755 (executable)
--- a/package/emulator-image-2.0-x86.install.windows
+++ b/package/emulator-image-2.0-x86.install.windows
@@ -30,7 +30,7 @@ FOR /F "tokens=1,2 delims==" %%A IN (%config_path%\tizen-sdk-data\.tizen-vms-pat
 
 IF NOT "%resent%" == "" (
        echo "RECENT_VMS_PATH = %resent%"
-       set workspace=%resent%\x86
+       set workspace=%resent%\vms
 )
 echo "WORKING_VMS_PATH = %workspace%"
 
@@ -49,19 +49,19 @@ IF EXIST "%sdk_path%\platforms\tmp.ini" (
 )
 
 IF %image_ver% == "" (
-set image_ver="type=\"standard\""
+set image_name="type=\"standard\""
 ) ELSE (
-set image_ver="base=\"%image_ver%\""
+set image_name="base=\"%image_ver%\""
 )
-echo "BASE_IMAGE_VERSION = %image_ver%"
+echo "BASE_IMAGE_VERSION = %image_name%"
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 FOR /D %%I IN (%workspace%\*) DO (
        IF EXIST "%%I\vm_config.xml" (
-               FINDSTR /I %image_ver% %%I\vm_config.xml
+               FINDSTR /I %image_name% %%I\vm_config.xml
                IF NOT ERRORLEVEL 1 (
                        RD /S /Q %%I
                )
        )
 )
-
+echo "DONE"

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index cdd7265..8e8e28c 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-img
-Version: 1.3.8
+Version: 1.3.9
 Maintainer: Yeong-Kyoon Lee <yeongkyoon.lee@samsung.com>
 
 Package: emulator-image-2.0-x86