Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions src/aou-sas/sas-pre-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,3 @@ mkdir -p /data/saswork /data/utilloc
# Chown only the directories we manage, not /data/workspace (contains gcsfuse mounts)
chown aou:aougroup /data
chown -R aou:aougroup /data/saswork /data/utilloc

###############################################################################
# AoU environment loader (staged in Dockerfile at /opt/sas/aou/)
###############################################################################
if [ -d /opt/sas/aou ]; then
cp -n /opt/sas/aou/load-env /opt/sas/aou/load-env.sh /data/ 2>/dev/null || true
chown aou:aougroup /data/load-env /data/load-env.sh 2>/dev/null || true
fi
4 changes: 2 additions & 2 deletions src/aou-sas/setup-sas-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set -o pipefail
readonly USER_NAME="${1}"
readonly DATA_DIR="${2}"

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

# Extract export statements from .bashrc to get workbench environment variables
Expand Down
Loading