diff --git a/narwhal.local.conf b/narwhal.local.conf index 482c677c4..5df81b251 100644 --- a/narwhal.local.conf +++ b/narwhal.local.conf @@ -1,5 +1,14 @@ -if [ -z "$NARWHAL_ENGINE" ] && [ -d "$NARWHAL_HOME/packages/narwhal-jsc" ]; then - export NARWHAL_ENGINE=jsc +if [ -z "$NARWHAL_ENGINE" ] && [ `uname` == "Darwin" ]; then + # We should check "narwhal-jsc.conf" and the corresponding executable to determine whether JSC can be "$NARWHAL_ENGINE". + if [ -f "$NARWHAL_HOME/packages/narwhal-jsc/narwhal-jsc.conf" ]; then + source "$NARWHAL_HOME/packages/narwhal-jsc/narwhal-jsc.conf" + fi + if [ -z "$NARWHAL_JSC_MODE" ]; then + NARWHAL_JSC_MODE="jscore" + fi + if [ -f "$NARWHAL_HOME/packages/narwhal-jsc/bin/narwhal-$NARWHAL_JSC_MODE" ]; then + export NARWHAL_ENGINE=jsc + fi fi if [ "$NARWHAL_ENGINE" == jsc ] && [ `ulimit -n` -lt 1024 ]; then