Skip to content

Commit 492755c

Browse files
committed
Activate Anaconda; use a log()
1 parent 101faa6 commit 492755c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

dev/github-actions/edit-settings.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,31 @@ set -eu
77
# We immediately cd into /dev/
88
# Provide -r to turn on R support
99

10+
log()
11+
{
12+
echo "edit-settings.sh:" ${*}
13+
}
14+
1015
cd dev
1116
SETTINGS_SH=build/swift-t-settings.sh
1217
SETTINGS_ORIG=build/swift-t-settings.orig
1318

1419
cp -v $SETTINGS_SH $SETTINGS_ORIG
1520

16-
echo "Editing $SETTINGS_SH ..."
21+
ACTIVATE=( source $CONDA/bin/activate base )
22+
log ${ACTIVATE[@]}
23+
$ACTIVATE
24+
25+
log $SETTINGS_SH ...
1726
sed -i -f github-actions/settings.sed $SETTINGS_SH
1827

1928
if [[ "$1" == "-r" ]]
2029
then
2130
RHOME=$( R RHOME )
22-
echo "RHOME=$RHOME"
31+
log "RHOME=$RHOME"
2332
sed -i 's/ENABLE_R=0/ENABLE_R=1/' $SETTINGS_SH
2433
sed -i "s@# R_INSTALL=.*@R_INSTALL=$RHOME@" $SETTINGS_SH
2534
fi
2635

27-
echo "Settings changed:"
36+
log "settings changed:"
2837
diff $SETTINGS_ORIG $SETTINGS_SH

0 commit comments

Comments
 (0)