use get_node_modules_url in platform.sh to determine fnm url

firewalla · Nov 7, 2018 · 786c852 · 786c852
1 parent 676bd47
commit 786c852
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/platform/blue/platform.sh b/platform/blue/platform.sh
@@ -6,7 +6,6 @@ FIREMON_MAX_MEMORY=240000
 FIREAPI_MAX_MEMORY=200000
 MAX_NUM_OF_PROCESSES=4000
 MAX_NUM_OF_THREADS=20000
-export NODE_MODULE_REPO=https://github.com/firewalla/fnm.node8.aarch64
 
 function heartbeatLED {
   sudo sh -c 'echo none > /sys/devices/platform/leds/leds/nanopi:green:status/trigger' # intentionally not use green light as it is hard to be seen

diff --git a/platform/docker/platform.sh b/platform/docker/platform.sh
@@ -6,7 +6,6 @@ FIREMON_MAX_MEMORY=240000
 FIREAPI_MAX_MEMORY=200000
 MAX_NUM_OF_PROCESSES=4000
 MAX_NUM_OF_THREADS=20000
-export NODE_MODULE_REPO=https://github.com/firewalla/fnm.node8.x86_64
 
 
 function heartbeatLED {

diff --git a/platform/red/platform.sh b/platform/red/platform.sh
@@ -6,7 +6,6 @@ FIREMON_MAX_MEMORY=120000
 FIREAPI_MAX_MEMORY=100000
 MAX_NUM_OF_PROCESSES=2000
 MAX_NUM_OF_THREADS=10000
-export NODE_MODULE_REPO=https://github.com/firewalla/fnm.node8.armv7l
 
 function heartbeatLED {
   sudo sh -c 'echo heartbeat > /sys/class/leds/nanopi:blue:status/trigger'

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -17,6 +17,7 @@ function update_node_modules {
     ( cd $FIREWALLA_HOME
 
     CPU_PLATFORM=$(uname -m)
+    export NODE_MODULE_REPO=$(get_node_modules_url)
 
     if [[ $branch =~ release.* ]]; then
         # record production branch in redis

diff --git a/scripts/main-start b/scripts/main-start
@@ -31,6 +31,7 @@ MGIT=$(PATH=$PI_HOME/scripts:$FIREWALLA_HOME/scripts; /usr/bin/which mgit||echo
 # use github to pull node modules to ~/.node_modules
 export FIREWALLA_NODE_MODULES_MODE=GIT
 
+NODE_MODULE_REPO=$(get_node_modules_url)
 logger "Node module repo: $NODE_MODULE_REPO"
 
 export NODE_PATH=~/.node_modules:$NODE_PATH

diff --git a/scripts/prep/01_node_modules_setup.sh b/scripts/prep/01_node_modules_setup.sh
@@ -3,6 +3,7 @@
 rc=0
 
 : ${NM_DIR:=/home/pi/.node_modules}
+mkdir -p $NM_DIR
 : ${FIREWALLA_HOME:=/home/pi/firewalla}
 source ${FIREWALLA_HOME}/platform/platform.sh