From: yongsung1.kim <yongsung1.kim@samsung.com>
Date: Tue, 4 Mar 2014 10:02:15 +0000 (+0900)
Subject: [STUB] Modify nsis script.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F17151%2F1;p=sdk%2Finstaller%2Finstall-manager.git

[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
--- a/os_stubs/windows/InstallManager-64.nsi
+++ b/os_stubs/windows/InstallManager-64.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"
 
-Name "Tizen-SDK"
+Name "Samsung-gear-SDK"
 
 ShowInstDetails show
 
@@ -168,11 +168,19 @@ done:
 	## Check java version and java execution.
 	ExpandEnvStrings $3 %COMSPEC%
 
-	${DisableX64FSRedirection} ; execute cmd command for windows7 64bit
-	nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'
-	Pop $0
-	Pop $6
-	${EnableX64FSRedirection} ; execute cmd command for windows7 64bit
+        ${If} $3 == "%COMSPEC%"
+                ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit
+                nsExec::ExecToStack '"java.exe" "-version"'
+               	${EnableX64FSRedirection} ; execute cmd command for windows7 64bit
+                Pop $0
+                Pop $6
+        ${Else}
+      		${DisableX64FSRedirection} ; execute cmd command for windows7 64bit
+                nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'
+               	${EnableX64FSRedirection} ; execute cmd command for windows7 64bit
+                Pop $0
+                Pop $6
+        ${EndIf}
 
 	## check java 1.6
 	Push $6
diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index e416de1..beed2a3 100644
--- a/os_stubs/windows/InstallManager.nsi
+++ b/os_stubs/windows/InstallManager.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"
 
-Name "Tizen-SDK"
+Name "Samsung-gear-SDK"
 
 ShowInstDetails show
 
@@ -166,8 +166,13 @@ done:
 
 	## Check java version and java execution.
 	ExpandEnvStrings $3 %COMSPEC%
-	
-	nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'
+
+	${If} $3 == "%COMSPEC%"
+                nsExec::ExecToStack '"java.exe" "-version"'
+        ${Else}
+                nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'
+        ${EndIf}
+
 	Pop $0
 	Pop $6
 	## check java 1.6