From 41b5b6402af3a7f9a46ab49e010809f6f94ecfac Mon Sep 17 00:00:00 2001
From: Jackson Burns <33505528+JacksonBurns@users.noreply.github.com>
Date: Sat, 16 Mar 2024 17:45:09 -0400
Subject: [PATCH] make pycall associate with correct python executable

---
 .conda/build.sh | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/.conda/build.sh b/.conda/build.sh
index 68929cf89a6..09e72e0f9e6 100644
--- a/.conda/build.sh
+++ b/.conda/build.sh
@@ -1,37 +1,14 @@
 set -x
 
-# from https://github.com/ReactionMechanismGenerator/RMG-Py/pull/2631#issuecomment-1998723914
-#make julia directory
-mkdir -p ${PREFIX}/share/julia/site
-mkdir -p ${PREFIX}/bin
-#set JULIA_DEPOT_PATH in conda env
-export JULIA_DEPOT_PATH="${PREFIX}/share/julia/site"
-ACTIVATE_ENV="${PREFIX}/etc/conda/activate.d/env_vars.sh"
-DEACTIVATE_ENV="${PREFIX}/etc/conda/deactivate.d/env_vars.sh"
-
 if [ -f "$ACTIVATE_ENV" ]; then
-        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
-        echo "export JULIA_OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $ACTIVATE_ENV
-        echo "export LD_LIBRARY_PATH=\"${PREFIX}/lib\"" >> $ACTIVATE_ENV
+        echo 'python-jl -c "import julia; julia.install()"' >> $ACTIVATE_ENV
+        # echo 'sed -i \'/julia.install/d\' $ACTIVATE_ENV' >> $ACTIVATE_ENV
 else
         mkdir -p ${PREFIX}/etc/conda/activate.d
         touch ${PREFIX}/etc/conda/activate.d/env_vars.sh
         echo '#!/bin/sh' >> $ACTIVATE_ENV
-        echo "export JULIA_DEPOT_PATH=\"${PREFIX}/share/julia/site\"" >> $ACTIVATE_ENV
-        echo "export JULIA_OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $ACTIVATE_ENV
-        echo "export LD_LIBRARY_PATH=\"${PREFIX}/lib\"" >> $ACTIVATE_ENV
-fi
-if [ -f "$DEACTIVATE_ENV" ]; then
-        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
-        echo "export LD_LIBRARY_PATH=$JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
-        echo "unset JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
-else
-        mkdir -p ${PREFIX}/etc/conda/deactivate.d
-        touch ${PREFIX}/etc/conda/deactivate.d/env_vars.sh
-        echo '#!/bin/sh' >> $DEACTIVATE_ENV
-        echo "unset JULIA_DEPOT_PATH" >> $DEACTIVATE_ENV
-        echo "export LD_LIBRARY_PATH=$JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
-        echo "unset JULIA_OLD_LD_LIBRARY_PATH" >> $DEACTIVATE_ENV
+        echo 'python-jl -c "import julia; julia.install()"' >> $ACTIVATE_ENV
+        # echo 'sed -i \'/julia.install/d\' $ACTIVATE_ENV' >> $ACTIVATE_ENV
 fi
 
 make install