From d5b2e46837117e8748dcb7f31e71d6107f757b1b Mon Sep 17 00:00:00 2001 From: lemke_h Date: Fri, 6 May 2022 15:19:33 +0200 Subject: [PATCH] adjusting new anaconda path --- anaconda_bernina_env | 10 ++++------ anaconda_env | 4 ++-- anaconda_env.bak | 4 ++-- anaconda_manual | 2 +- anaconda_testenv | 2 +- bpy | 2 +- eco-dev | 2 +- feloff | 2 +- felon | 2 +- ipylab | 2 +- laseroff | 2 +- laseron | 2 +- 12 files changed, 17 insertions(+), 19 deletions(-) diff --git a/anaconda_bernina_env b/anaconda_bernina_env index fd2a7bb..349b409 100755 --- a/anaconda_bernina_env +++ b/anaconda_bernina_env @@ -1,16 +1,14 @@ # 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/anaconda/anaconda3/bin/conda' shell.bash hook 2> /dev/null)" +__conda_setup="$(CONDA_REPORT_ERRORS=false '/sf/bernina/applications/anaconda/anaconda3/bin/conda' shell.bash hook 2> /dev/null)" if [ $? -eq 0 ]; then \eval "$__conda_setup" else - if [ -f "/sf/bernina/anaconda/anaconda3/etc/profile.d/conda.sh" ]; then - . "/sf/bernina/anaconda/anaconda3/etc/profile.d/conda.sh" + 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 else - \export PATH="/sf/bernina/anaconda/anaconda3/bin:$PATH" + \export PATH="/sf/bernina/appplications/anaconda/anaconda3/bin:$PATH" fi fi -unset __conda_setup - diff --git a/anaconda_env b/anaconda_env index ebac405..ea76158 100755 --- a/anaconda_env +++ b/anaconda_env @@ -5,14 +5,14 @@ # exit 1 #fi -default=/sf/bernina/anaconda/bernina_envs/bernina_default +default=/sf/bernina/applications/anaconda/bernina_envs/bernina_default dest=${1:-$default} echo Loading Bernina Anaconda Python source /sf/bernina/bin/anaconda_bernina_env -conda config --add envs_dirs /sf/bernina/anaconda/bernina_envs +conda config --add envs_dirs /sf/bernina/applications/anaconda/bernina_envs conda config --set env_prompt '({name})' echo Activating Conda environment ${1:-$dest} diff --git a/anaconda_env.bak b/anaconda_env.bak index 24f4dd4..1806614 100755 --- a/anaconda_env.bak +++ b/anaconda_env.bak @@ -5,8 +5,8 @@ # exit 1 #fi -default=/sf/bernina/anaconda/bernina36 -default=/sf/bernina/anaconda/psi_python_envs/bernina36 +default=/sf/bernina/applications/anaconda/bernina36 +default=/sf/bernina/applications/anaconda/psi_python_envs/bernina36 dest=${1:-$default} echo Loading PSI Anaconda Python distribution 3.6 diff --git a/anaconda_manual b/anaconda_manual index 7ff10cc..814d91e 100755 --- a/anaconda_manual +++ b/anaconda_manual @@ -1,5 +1,5 @@ #!/bin/bash -/sf/bernina/bin/bpython -m rich.markdown /sf/bernina/anaconda/env_specifications/manual.md +/sf/bernina/bin/bpython -m rich.markdown /sf/bernina/applications/anaconda/env_specifications/manual.md diff --git a/anaconda_testenv b/anaconda_testenv index 7b13fd6..2aee97c 100755 --- a/anaconda_testenv +++ b/anaconda_testenv @@ -5,7 +5,7 @@ # exit 1 #fi -dest=/sf/bernina/anaconda/bernina36_test +dest=/sf/bernina/applications/anaconda/bernina36_test echo Loading PSI Anaconda Python distribution 3.6 module load psi-python36/4.4.0 diff --git a/bpy b/bpy index 686aae3..1abfce4 100755 --- a/bpy +++ b/bpy @@ -9,7 +9,7 @@ default="bernina37" dest=${1:-$default} echo Loading Bernina Anaconda Python -source /sf/bernina/anaconda/bm/bin/activate +source /sf/bernina/applications/anaconda/bm/bin/activate #conda config --add envs_dirs /sf/bernina/anaconda/bernina_envs diff --git a/eco-dev b/eco-dev index 2bf2d27..1342917 100755 --- a/eco-dev +++ b/eco-dev @@ -1,7 +1,7 @@ #/bin/bash #source /opt/gfa/python source anaconda_bernina_env -conda activate /sf/bernina/anaconda/bernina_envs/bernina36_op +conda activate /sf/bernina/applications/anaconda/bernina_envs/bernina36_op ipython --pylab --profile=eco --no-banner -i -c "run /sf/bernina/config/src/python/eco_dev/startup_inline.py -l -s bernina" diff --git a/feloff b/feloff index f0de710..eb697ff 100755 --- a/feloff +++ b/feloff @@ -1,4 +1,4 @@ #!/bin/bash caput SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP 0 -/sf/bernina/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("FEL beam blocked");e.runAndWait()' +/sf/bernina/applications/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("FEL beam blocked");e.runAndWait()' diff --git a/felon b/felon index d68805d..b7d368d 100755 --- a/felon +++ b/felon @@ -1,3 +1,3 @@ #!/bin/bash caput SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP 1 -/sf/bernina/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("FEL beam on");e.runAndWait()' +/sf/bernina/applications/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("FEL beam on");e.runAndWait()' diff --git a/ipylab b/ipylab index 94e8e94..69d3517 100755 --- a/ipylab +++ b/ipylab @@ -1,3 +1,3 @@ #!/bin/bash -/sf/bernina/anaconda/bernina_envs/bernina37/bin/ipython --pylab +/sf/bernina/applications/anaconda/bernina_envs/bernina37/bin/ipython --pylab diff --git a/laseroff b/laseroff index 217e860..7a3eed2 100755 --- a/laseroff +++ b/laseroff @@ -1,4 +1,4 @@ #!/bin/bash caput SLAAR21-LTIM01-EVR0:FrontUnivOut3_SOURCE2 "HIGH" caput SLAAR21-LPSYS-ESB:SHUT_TRANS "ON" -/sf/bernina/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("Laser blocked");e.runAndWait()' +/sf/bernina/applications/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("Laser blocked");e.runAndWait()' diff --git a/laseron b/laseron index 098daa4..47dd1ca 100755 --- a/laseron +++ b/laseron @@ -1,4 +1,4 @@ #!/bin/bash caput SLAAR21-LTIM01-EVR0:FrontUnivOut3_SOURCE2 "LOW" caput SLAAR21-LPSYS-ESB:OPEN_TRANS "ON" -/sf/bernina/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("Laser open");e.runAndWait()' +/sf/bernina/applications/anaconda/bernina_envs/bernina_default/bin/python -c 'import pyttsx3;e = pyttsx3.init();e.say("Laser open");e.runAndWait()'