revert bad merge

conda · Dec 12, 2023 · 8459f76 · 8459f76
1 parent 9f02022
commit 8459f76
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/constructor/winexe.py b/constructor/winexe.py
@@ -139,14 +139,13 @@ def setup_envs_commands(info, dir_path):
         # Set register_envs
         System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_REGISTER_ENVS", "{register_envs}").r0'
 
-        # Run conda
-        SetDetailsPrint TextOnly
-        nsExec::ExecToLog '"$INSTDIR\_conda.exe" install --offline -yp "{prefix}" --file "{env_txt}" {shortcuts}'
-        Pop $0
-        ${{If}} $0 != "0"
-            DetailPrint "::error:: Failed to link extracted packages to {prefix}!"
-            MessageBox MB_OK|MB_ICONSTOP "Failed to link extracted packages to {prefix}. Please check logs." /SD IDOK
-            Abort
+        # Run conda install
+        ${{If}} $Ana_CreateShortcuts_State = ${{BST_CHECKED}}
+            DetailPrint "Installing packages for {name}, creating shortcuts if necessary..."
+            push '"$INSTDIR\_conda.exe" install --offline -yp "{prefix}" --file "{env_txt}" {shortcuts}'
+        ${{Else}}
+            DetailPrint "Installing packages for {name}..."
+            push '"$INSTDIR\_conda.exe" install --offline -yp "{prefix}" --file "{env_txt}" --no-shortcuts'
         ${{EndIf}}
         push 'Failed to link extracted packages to {prefix}!'
         push 'WithLog'