Merge pull request #3532 from architecture-building-systems/cea-dev-w…

…indows-fix Install git and use micromamba run
architecture-building-systems · Mar 20, 2024 · 9d3e2fe · 9d3e2fe
2 parents 81653b7 + 3563634
commit 9d3e2fe
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/setup/cityenergyanalyst.nsi b/setup/cityenergyanalyst.nsi
@@ -159,10 +159,13 @@ SectionEnd
 
 Section /o "Developer version" Clone_Repository_Section
 
+    DetailPrint 'Installing git to CEA environment'
+    nsExec::ExecToLog '"$INSTDIR\dependencies\micromamba.exe" -r "$INSTDIR\dependencies\micromamba" -n cea install git -c conda-forge -y'
+
     DetailPrint 'Cloning GitHub Repository ${CEA_REPO_URL} to "$INSTDIR\CityEnergyAnalyst"'
-    nsExec::ExecToLog '"$INSTDIR\dependencies\cea-env.bat" git clone ${CEA_REPO_URL}'
+    nsExec::ExecToLog '"$INSTDIR\dependencies\micromamba.exe" run -r "$INSTDIR\dependencies\micromamba" -n cea git clone ${CEA_REPO_URL}'
     DetailPrint "Binding CEA to repository"
-    nsExec::ExecToLog '"$INSTDIR\dependencies\cea-env.bat" pip install -e "$INSTDIR\CityEnergyAnalyst"'
+    nsExec::ExecToLog '"$INSTDIR\dependencies\micromamba.exe" run -r "$INSTDIR\dependencies\micromamba" -n cea pip install -e "$INSTDIR\CityEnergyAnalyst"'
 
 SectionEnd