Skip to content

Remove module commands in favour of explict environment variables #1490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rtuck99 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove module commands in favour of explict environment variables #1490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions run_hyperion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,16 @@ if [[ $START == 1 ]]; then
if [ $IN_DEV == false ]; then
check_user
ISPYB_CONFIG_PATH="/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-${BEAMLINE}.cfg"
ZOCALO_CONFIG=/dls_sw/apps/zocalo/live/configuration.yaml
else
ISPYB_CONFIG_PATH="$RELATIVE_SCRIPT_DIR/tests/test_data/ispyb_test_credentials.cfg"
ZOCALO_CONFIG="$RELATIVE_SCRIPT_DIR/tests/test_data/zocalo-test-configuration.yaml"
export ZOCALO_CONFIG
fi
export ZOCALO_CONFIG
export ISPYB_CONFIG_PATH

kill_active_apps

module unload controls_dev
module load dials

cd ${RELATIVE_SCRIPT_DIR}

if [ -z "$LOG_DIR" ]; then
Expand Down