From 8459f763b0b3d6e1788b8b89f9aad9394a94a48a Mon Sep 17 00:00:00 2001
From: jaimergp <jaimergp@users.noreply.github.com>
Date: Tue, 12 Dec 2023 12:45:22 +0100
Subject: [PATCH] revert bad merge

---
 constructor/winexe.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/constructor/winexe.py b/constructor/winexe.py
index 8d0e0d812..88aac2437 100644
--- 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'