Skip to content

Commit c2b89e0

Browse files
author
David Erb
committed
make default configuration
1 parent 0e3ee22 commit c2b89e0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile-conda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ deploy_modules:
4545
mkdir -p $(MODULE_TARGET)/$(VERSION)
4646
cp modulefiles/* $(MODULE_TARGET)/$(VERSION)
4747
rm -f $(MODULE_TARGET)/edge
48-
ln -s $(MODULE_TARGET)/$(VERSION)/paths $(MODULE_TARGET)/edge
48+
ln -s $(MODULE_TARGET)/$(VERSION) $(MODULE_TARGET)/edge
4949
find $(MODULE_TARGET) -type f -exec chmod 664 {} \;
5050
find $(MODULE_TARGET) -type d -exec chmod g+s {} \;
5151
chgrp -R dls-softinst $(MODULE_TARGET)
5252

5353
deploy_modules_stable:
5454
rm -f $(MODULE_TARGET)/stable
55-
ln -s $(MODULE_TARGET)/$(VERSION)/paths $(MODULE_TARGET)/stable
55+
ln -s $(MODULE_TARGET)/$(VERSION) $(MODULE_TARGET)/stable
5656

5757
# ------------------------------------------------------------------
5858
# Rsync stuff from local C: drive to shared V: drive.

modulefiles/paths

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ proc ModulesHelp { } {
77

88
module-whatis "sets up the environment for soakdb3 commands"
99

10-
# The soakdb3 main config file is per-visit.
11-
setenv SOAKDB3_CONFIGFILE $workflows_directory/configurations/multibox.yaml
12-
1310
# The soakdb3 conda environment we want to use.
1411
set conda_environment_version edge
1512
set conda_environment /dls_sw/apps/soakdb3/conda/envs/soakdb3/$conda_environment_version
1613

14+
# The soakdb3 main config file.
15+
setenv SOAKDB3_CONFIGFILE $conda_environment/lib/python3.10/site-packages/soakdb3_cli/configurations/default/configuration.yaml
16+
1717
# Function to display versions.
1818
set soakdb3_about "$conda_environment/bin/python -m soakdb3_cli.main --about"
1919
set-alias "soakdb3_about" $soakdb3_about
File renamed without changes.

0 commit comments

Comments
 (0)