diff --git a/anaconda_bernina_env b/anaconda_bernina_env index 349b409..65ba0ed 100755 --- a/anaconda_bernina_env +++ b/anaconda_bernina_env @@ -1,14 +1,13 @@ -# added by Anaconda3 2018.12 installer -# >>> conda init >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$(CONDA_REPORT_ERRORS=false '/sf/bernina/applications/anaconda/anaconda3/bin/conda' shell.bash hook 2> /dev/null)" +__conda_setup="$('/sf/bernina/applications/bm/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" if [ $? -eq 0 ]; then - \eval "$__conda_setup" + eval "$__conda_setup" else - if [ -f "/sf/bernina/applications/anaconda/anaconda3/etc/profile.d/conda.sh" ]; then - . "/sf/bernina/applications/anaconda/anaconda3/etc/profile.d/conda.sh" - CONDA_CHANGEPS1=false conda activate base + if [ -f "/sf/bernina/applications/bm/etc/profile.d/conda.sh" ]; then + . "/sf/bernina/applications/bm/etc/profile.d/conda.sh" else - \export PATH="/sf/bernina/appplications/anaconda/anaconda3/bin:$PATH" + export PATH="/sf/bernina/applications/bm/bin:$PATH" fi fi +unset __conda_setup + diff --git a/anaconda_env b/anaconda_env index ea76158..b65c28f 100755 --- a/anaconda_env +++ b/anaconda_env @@ -5,15 +5,15 @@ # exit 1 #fi -default=/sf/bernina/applications/anaconda/bernina_envs/bernina_default +default="bernina37" dest=${1:-$default} -echo Loading Bernina Anaconda Python +echo Loading Bernina Anaconda Python # <<< conda initialize <<< source /sf/bernina/bin/anaconda_bernina_env -conda config --add envs_dirs /sf/bernina/applications/anaconda/bernina_envs -conda config --set env_prompt '({name})' +#conda config --add envs_dirs /sf/bernina/applications/anaconda/bernina_envs +#conda config --set env_prompt '({name})' echo Activating Conda environment ${1:-$dest} conda activate ${1:-$dest} diff --git a/create_data_symlinks b/create_data_symlinks index 76ebd93..013856f 100755 --- a/create_data_symlinks +++ b/create_data_symlinks @@ -1,7 +1,7 @@ #!/bin/bash cd ln -s /sf/bernina/data bernina_data -ln -s /sf/bernina/config/exp bernina_exp +ln -s /sf/bernina/exp bernina_exp diff --git a/get_bernina_PVs_alive b/get_bernina_PVs_alive index bf6960f..66c2acf 100755 --- a/get_bernina_PVs_alive +++ b/get_bernina_PVs_alive @@ -1,4 +1,4 @@ -#!/sf/bernina/anaconda/bernina_envs/default/bin/python +#!/sf/bernina/applications/anaconda/bernina_envs/default/bin/python import sys from epics import caget_many sys.path.insert(0,'/sf/bernina/config/src/python/eco') diff --git a/saythis b/saythis index 02512c0..6c0ede3 100755 --- a/saythis +++ b/saythis @@ -1,4 +1,4 @@ -#!/sf/bernina/anaconda/bernina_envs/bernina_default/bin/python +#!/sf/bernina/applications/anaconda/bernina_envs/bernina_default/bin/python import sys import pyttsx3 e = pyttsx3.init()