TISTUD-6593 Unable to install studio when git is manually installed u…

…sing context menu option - since git1.8.3
aptana · Jun 10, 2014 · 4117e9d · 4117e9d
1 parent ac5c5a8
commit 4117e9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/builders/com.aptana.win.installer/AptanaStudio.aip b/builders/com.aptana.win.installer/AptanaStudio.aip
@@ -261,13 +261,15 @@
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
     <ROW PrereqKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C" DisplayName="Java Runtime Environment" VersionMin="1.6.0" SetupFileUrl="http://go.appcelerator.com/installer_jre_windows" Location="1" ExactSize="29405096" Operator="1" ComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" BasicUiComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" NoUiComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" Options="m" MD5="6fa7457f23ab31e68a674e5342fe32bd"/>
     <ROW PrereqKey="Node.JS" DisplayName="Node.JS" VersionMin="0.8.3" VersionMax="0.11.0" SetupFileUrl="http://go.appcelerator.com/installer_nodejs_windows.msi" Location="1" ExactSize="5324800" Win9xVersions="Windows 9x/ME" Operator="1" ComLine="/qb REBOOT=ReallySuppress" Options="m" MD5="a3c37a562400e3971bfdd53cf98bc802" Type="1" Feature="Node.JS"/>
-    <ROW PrereqKey="Node.JS_1" DisplayName="MSYSGIT" VersionMin="1.7" SetupFileUrl="http://go.appcelerator.com/installer_git_windowsexe" Location="1" ExactSize="15586182" Win9xVersions="Windows 9x/ME" Operator="1" ComLine="/SP- /SILENT /NORESTART" Options="m" MD5="d42f7e12cf9221420e0d0a4293ad36e9" Type="1" Feature="Node.JS_1"/>
+    <ROW PrereqKey="Node.JS_1" DisplayName="MSYSGIT" VersionMin="1.7" SetupFileUrl="http://go.appcelerator.com/installer_git_windows.exe" Location="1" ExactSize="15586182" Operator="1" ComLine="/SP- /SILENT /NORESTART" Options="m" MD5="d42f7e12cf9221420e0d0a4293ad36e9" Type="1" Feature="Node.JS_1"/>
     <ATTRIBUTE name="PrereqsOrder" value="EC39D_0B8D_4C2E_A373_7F11E2281A4C Node.JS Node.JS_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
     <ROW SearchKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C_JRE_SEARCH" Prereq="EC39D_0B8D_4C2E_A373_7F11E2281A4C" SearchType="1" SearchString="HKLM\SOFTWARE\JavaSoft\Java Runtime Environment" VerMin="1.6.0" Order="1" Property="AI_JRE_PREREQSEARCH_PROP"/>
     <ROW SearchKey="GitCheetah" Prereq="Node.JS_1" SearchType="5" SearchString="HKCU\Software\Git-Cheetah" Order="2" Property="PREREQSEARCH"/>
     <ROW SearchKey="InstallPath" Prereq="Node.JS" SearchType="7" SearchString="HKCU\Software\Node.js\InstallPath" Order="2" Property="PREREQSEARCH_1"/>
     <ROW SearchKey="Version" Prereq="Node.JS" SearchType="2" SearchString="HKCU\Software\Node.js\Version" VerMin="0.8.3" Order="2" Property="PREREQSEARCH_1_1"/>
+    <ROW SearchKey="git.exe" Prereq="Node.JS_1" SearchType="0" SearchString="[ProgramFilesFolder]\Git\bin\git.exe" VerMin="1.7" Order="2" Property="PreReqSearch"/>
+    <ROW SearchKey="git.exe_1" Prereq="Node.JS_1" SearchType="0" SearchString="[ProgramFiles64Folder]\Git\bin\git.exe" VerMin="1.7" Order="1" Property="PreReqSearch_1"/>
   </COMPONENT>
 </DOCUMENT>
diff --git a/builders/com.aptana.win.installer/Aptana_Studio_3_Setup.aip b/builders/com.aptana.win.installer/Aptana_Studio_3_Setup.aip
@@ -299,13 +299,15 @@
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
     <ROW PrereqKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C" DisplayName="Java Runtime Environment" VersionMin="1.6.0" SetupFileUrl="http://go.appcelerator.com/installer_jre_windows" Location="1" ExactSize="29405096" Operator="1" ComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" BasicUiComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" NoUiComLine="/passive REBOOT=Suppress JAVAUPDATE=0 WEBSTARTICON=0" Options="m" MD5="6fa7457f23ab31e68a674e5342fe32bd"/>
     <ROW PrereqKey="Node.JS" DisplayName="Node.JS" VersionMin="0.8.3" VersionMax="0.11.0" SetupFileUrl="http://go.appcelerator.com/installer_nodejs_windows.msi" Location="1" ExactSize="5324800" Win9xVersions="Windows 9x/ME" Operator="1" ComLine="/qb REBOOT=ReallySuppress" Options="m" MD5="a3c37a562400e3971bfdd53cf98bc802" Type="1" Feature="Node.JS"/>
-    <ROW PrereqKey="Node.JS_1" DisplayName="MSYSGIT" VersionMin="1.7" SetupFileUrl="http://go.appcelerator.com/installer_git_windows.exe" Location="1" ExactSize="15586182" Win9xVersions="Windows 9x/ME" Operator="1" ComLine="/SP- /SILENT /NORESTART" Options="m" MD5="d42f7e12cf9221420e0d0a4293ad36e9" Type="1" Feature="Node.JS_1"/>
+    <ROW PrereqKey="Node.JS_1" DisplayName="MSYSGIT" VersionMin="1.7" SetupFileUrl="http://go.appcelerator.com/installer_git_windows.exe" Location="1" ExactSize="15586182" Operator="1" ComLine="/SP- /SILENT /NORESTART" Options="m" MD5="d42f7e12cf9221420e0d0a4293ad36e9" Type="1" Feature="Node.JS_1"/>
     <ATTRIBUTE name="PrereqsOrder" value="EC39D_0B8D_4C2E_A373_7F11E2281A4C Node.JS Node.JS_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
     <ROW SearchKey="EC39D_0B8D_4C2E_A373_7F11E2281A4C_JRE_SEARCH" Prereq="EC39D_0B8D_4C2E_A373_7F11E2281A4C" SearchType="1" SearchString="HKLM\SOFTWARE\JavaSoft\Java Runtime Environment" VerMin="1.6.0" Order="1" Property="AI_JRE_PREREQSEARCH_PROP"/>
     <ROW SearchKey="GitCheetah" Prereq="Node.JS_1" SearchType="5" SearchString="HKCU\Software\Git-Cheetah" Order="2" Property="PREREQSEARCH"/>
     <ROW SearchKey="InstallPath" Prereq="Node.JS" SearchType="7" SearchString="HKCU\Software\Node.js\InstallPath" Order="2" Property="PREREQSEARCH_1"/>
     <ROW SearchKey="Version" Prereq="Node.JS" SearchType="2" SearchString="HKCU\Software\Node.js\Version" VerMin="0.8.3" Order="2" Property="PREREQSEARCH_1_1"/>
+    <ROW SearchKey="git.exe" Prereq="Node.JS_1" SearchType="0" SearchString="[ProgramFilesFolder]\Git\bin\git.exe" VerMin="1.7" Order="2" Property="PreReqSearch"/>
+    <ROW SearchKey="git.exe_1" Prereq="Node.JS_1" SearchType="0" SearchString="[ProgramFiles64Folder]\Git\bin\git.exe" VerMin="1.7" Order="1" Property="PreReqSearch_1"/>
   </COMPONENT>
 </DOCUMENT>