Skip to content

Commit fb83386

Browse files
Fix SAS environment variables (#438)
1 parent 6cd8347 commit fb83386

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

src/aou-sas/sas-pre-deploy.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,3 @@ mkdir -p /data/saswork /data/utilloc
1818
# Chown only the directories we manage, not /data/workspace (contains gcsfuse mounts)
1919
chown aou:aougroup /data
2020
chown -R aou:aougroup /data/saswork /data/utilloc
21-
22-
###############################################################################
23-
# AoU environment loader (staged in Dockerfile at /opt/sas/aou/)
24-
###############################################################################
25-
if [ -d /opt/sas/aou ]; then
26-
cp -n /opt/sas/aou/load-env /opt/sas/aou/load-env.sh /data/ 2>/dev/null || true
27-
chown aou:aougroup /data/load-env /data/load-env.sh 2>/dev/null || true
28-
fi

src/aou-sas/setup-sas-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ set -o pipefail
1414
readonly USER_NAME="${1}"
1515
readonly DATA_DIR="${2}"
1616

17-
if [ -f "${DATA_DIR}/load-env.sh" ]; then
18-
sudo -u "${USER_NAME}" bash -c "source '${DATA_DIR}/load-env.sh'" || true
17+
if [ -f "/opt/sas/aou/load-env.sh" ]; then
18+
sudo -u "${USER_NAME}" bash -c "source '/opt/sas/aou/load-env.sh'" || true
1919
fi
2020

2121
# Extract export statements from .bashrc to get workbench environment variables

0 commit comments

Comments
 (0)