diff --git a/hush.sh b/hush.sh index 3a08943..6f973c5 100755 --- a/hush.sh +++ b/hush.sh @@ -8,7 +8,7 @@ configSector=${configBase}/control echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -58,7 +58,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #C_EXT version -export PYTHONPATH=.:/afs/psi.ch/project/cafe/gitlab/CAFE/cycafe/python3.10-sls2/lib/RHEL8-x86_64:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} diff --git a/hush_g1.sh b/hush_g1.sh index e10bb3c..1e4f426 100755 --- a/hush_g1.sh +++ b/hush_g1.sh @@ -8,7 +8,7 @@ configSector=${configBase}/g1 echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -60,7 +60,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} diff --git a/hush_g2.sh b/hush_g2.sh index e9e30c3..2765981 100755 --- a/hush_g2.sh +++ b/hush_g2.sh @@ -8,7 +8,7 @@ configSector=${configBase}/g2 echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -60,7 +60,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} diff --git a/hush_g3.sh b/hush_g3.sh index b2fe461..52018d9 100755 --- a/hush_g3.sh +++ b/hush_g3.sh @@ -8,7 +8,7 @@ configSector=${configBase}/g3 echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -60,7 +60,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR} diff --git a/hush_o2.sh b/hush_o2.sh index 1b60cbb..1ce531f 100755 --- a/hush_o2.sh +++ b/hush_o2.sh @@ -8,7 +8,7 @@ configSector=${configBase}/o2 echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -61,7 +61,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then diff --git a/hush_pif.sh b/hush_pif.sh index 1815906..b367846 100755 --- a/hush_pif.sh +++ b/hush_pif.sh @@ -8,7 +8,7 @@ configSector=${configBase}/pif echo "${configSector}" module unload gcc -module load gcc/7.3.0 +module load gcc/7.5.0 if [ -z "$PS1" ] # no prompt? ### if [ -v PS1 ] # On Bash 4.2+ ... @@ -62,7 +62,7 @@ _EPICS_HOST_ARCH=${RHREL}-x86_64 #/sf/bd/applications/OnlineModel/default/scripts/VA: #C_EXT version for Py 3.7: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt "0" ] ; then