Skip to content

Commit ff5508d

Browse files
ssun30rwest
authored andcommitted
[RMS] Standard mode is now default
Developer mode will only be enabled if the user specify "developer" option for install_rms.sh
1 parent ae58015 commit ff5508d

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ env:
5454
RMG_DATABASE_BRANCH: main
5555
# RMS branch to use for ReactionMechanismSimulator installation
5656
RMS_BRANCH: for_rmg
57-
# Use standard RMS installation mode for install_rms.sh
57+
# RMS mode used for install_rms.sh
5858
RMS_MODE: CI
5959
# julia parallel pre-compilation leads to race conditions and hangs, so we limit it to run in serial
6060
JULIA_NUM_PRECOMPILE_TASKS: 1

install_rms.sh

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,15 @@ conda install -y conda-forge::pyjuliacall
7878
echo "Environment variables referencing JULIA:"
7979
env | grep JULIA
8080

81-
# Ask user whether to do a standard or developer install
82-
if [ -z "$RMS_MODE" ]; then
83-
echo "Choose installation mode:"
84-
echo " 1) Standard install (download from GitHub)"
85-
echo " 2) Developer install (install from local path)"
86-
read -p "Enter 1 or 2 [default: 1]: " installation_choice
87-
88-
if [ "$installation_choice" = "2" ]; then
89-
RMS_MODE="dev"
90-
else
91-
RMS_MODE="standard"
92-
fi
93-
fi
94-
95-
echo "Selected RMS installation mode: $RMS_MODE"
81+
# Defaults to "standard" if no arg provided
82+
RMS_MODE=${1:-standard}
9683

9784
# Default RMS branch for standard install
9885
RMS_BRANCH=${RMS_BRANCH:-for_rmg}
9986

10087
# Ask for local RMS path
101-
if [ "$RMS_MODE" = "dev" ]; then
88+
if [ "$RMS_MODE" = "developer" ]; then
89+
echo "Using developer mode for RMS installation"
10290
read -e -p "Please enter full path to your local RMS source code: " RMS_PATH
10391
if [ ! -d "$RMS_PATH" ]; then
10492
echo "ERROR: '$RMS_PATH' is not a valid directory."
@@ -140,7 +128,7 @@ if [ "$RMS_MODE" = "standard" ] || [ "$RMS_MODE" = "CI" ]; then
140128
exit(1)
141129
end
142130
EOF
143-
elif [ "$RMS_MODE" = "dev" ]; then
131+
elif [ "$RMS_MODE" = "developer" ]; then
144132
echo "Installing RMS in developer mode from path: $RMS_PATH"
145133
julia << EOF || echo "RMS developer install error - continuing anyway ¯\\_(ツ)_/¯"
146134
using Pkg
@@ -159,7 +147,7 @@ elif [ "$RMS_MODE" = "dev" ]; then
159147
end
160148
EOF
161149
else
162-
echo "Unknown RMS_MODE: $RMS_MODE. Must be either 'standard' or 'dev'."
150+
echo "Unknown RMS_MODE: $RMS_MODE. Must be either 'CI', 'standard' or 'developer'."
163151
exit 1
164152
fi
165153

0 commit comments

Comments
 (0)