[STUB] Modify nsis script.

Installmanager cannot work well sometimes because 'comspec' environment
variable is not set. So, Add if condition in nsis script.

Change-Id: I1b070395562a6183ba0ba86fa11b8d05fb58eb76
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/os_stubs/windows/InstallManager-64.nsi b/os_stubs/windows/InstallManager-64.nsi
index c41c187..2399ea4 100644 (file)
--- a/os_stubs/windows/InstallManager-64.nsi
+++ b/os_stubs/windows/InstallManager-64.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"\r
 \r
-Name "Tizen-SDK"\r
+Name "Samsung-gear-SDK"\r
 \r
 ShowInstDetails show\r
 \r
@@ -168,11 +168,19 @@ done:
        ## Check java version and java execution.\r
        ExpandEnvStrings $3 %COMSPEC%\r
 \r
-       ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
-       nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'\r
-       Pop $0\r
-       Pop $6\r
-       ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+        ${If} $3 == "%COMSPEC%"\r
+                ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+                nsExec::ExecToStack '"java.exe" "-version"'\r
+                       ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+                Pop $0\r
+                Pop $6\r
+        ${Else}\r
+               ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+                nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'\r
+                       ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+                Pop $0\r
+                Pop $6\r
+        ${EndIf}\r
 \r
        ## check java 1.6\r
        Push $6\r

diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index e416de1..beed2a3 100644 (file)
--- a/os_stubs/windows/InstallManager.nsi
+++ b/os_stubs/windows/InstallManager.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"\r
 \r
-Name "Tizen-SDK"\r
+Name "Samsung-gear-SDK"\r
 \r
 ShowInstDetails show\r
 \r
@@ -166,8 +166,13 @@ done:
 \r
        ## Check java version and java execution.\r
        ExpandEnvStrings $3 %COMSPEC%\r
-       \r
-       nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'\r
+\r
+       ${If} $3 == "%COMSPEC%"\r
+                nsExec::ExecToStack '"java.exe" "-version"'\r
+        ${Else}\r
+                nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'\r
+        ${EndIf}\r
+\r
        Pop $0\r
        Pop $6\r
        ## check java 1.6\r