Merge branch 'release/1.7.2'

CANDY-LINE · Nov 27, 2017 · 1877209 · 1877209
2 parents bb7b6a7 + bcec2ea
commit 1877209
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 # 履歴
+* 1.7.2
+    - 不要なリポジトリー更新を避けることによりインストール処理の時間を短縮
 * 1.7.1
     - オンラインインストール時に途中で失敗する問題を修正
 * 1.7.0

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ $ make PI_USER=linaro PI_HOST=192.168.1.10
 ### 動作確認 (RPi)
 
 ```bash
-$ VERSION=1.7.1 && rm -fr tmp && mkdir tmp && cd tmp && \
+$ VERSION=1.7.2 && rm -fr tmp && mkdir tmp && cd tmp && \
   tar zxf ~/candy-pi-lite-service-${VERSION}.tgz
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 ./install.sh
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 CONFIGURE_STATIC_IP_ON_BOOT=1 ./install.sh

diff --git a/install.sh b/install.sh
@@ -18,7 +18,7 @@ VENDOR_HOME=/opt/candy-line
 
 SERVICE_NAME=candy-pi-lite
 GITHUB_ID=CANDY-LINE/candy-pi-lite-service
-VERSION=1.7.1
+VERSION=1.7.2
 # Channel B
 UART_PORT="/dev/ttySC1"
 MODEM_BAUDRATE=${MODEM_BAUDRATE:-460800}
@@ -49,6 +49,7 @@ CONFIGURE_STATIC_IP_ON_BOOT=${CONFIGURE_STATIC_IP_ON_BOOT:-""}
 OFFLINE_PERIOD_SEC=${OFFLINE_PERIOD_SEC:-30}
 ENABLE_WATCHDOG=${ENABLE_WATCHDOG:-1}
 COFIGURE_ENOCEAN_PORT=${COFIGURE_ENOCEAN_PORT:-1}
+CANDY_PI_LITE_APT_GET_UPDATED=${CANDY_PI_LITE_APT_GET_UPDATED:-0}
 
 REBOOT=0
 
@@ -204,10 +205,20 @@ function configure_watchdog {
   info "Hardware Watchdog configuration done"
 }
 
+function apt_get_update {
+  if [ "${CANDY_PI_LITE_APT_GET_UPDATED}" == "1" ]; then
+    return
+  fi
+  CANDY_PI_LITE_APT_GET_UPDATED=1
+  apt-get update -y
+}
+
 function install_ppp {
   info "Installing ufw and ppp..."
-  apt-get update -y
-  apt-get install -y ufw ppp pppconfig
+  if [ "${FORCE_INSTALL}" != "1" ]; then
+    apt_get_update
+    apt-get install -y ufw ppp
+  fi
 
   # _common.sh is copied by install_service
   cp -f ${SRC_DIR}/systemd/apn-list.json ${SERVICE_HOME}/apn-list.json
@@ -234,46 +245,52 @@ function install_candy_red {
   if [ "${CANDY_RED}" == "0" ]; then
     return
   fi
-  NODEJS_VER=`node -v`
-  if [ "$?" == "0" ]; then
-    for v in ${NODEJS_VERSIONS}
-    do
-      echo ${NODEJS_VER} | grep -oE "${v/./\\.}\..*"
-      if [ "$?" == "0" ]; then
-        unset NODEJS_VER
-      fi
-    done
-  else
-    NODEJS_VER="N/A"
-  fi
-  apt-get update -y
-  if [ -n "${NODEJS_VER}" ]; then
-    info "Installing Node.js..."
-    MODEL_NAME=`cat /proc/cpuinfo | grep "model name"`
-    if [ "$?" != "0" ]; then
-      alert "Unsupported environment"
-      exit 1
-    fi
-    apt-get remove -y nodered nodejs nodejs-legacy npm
-    echo ${MODEL_NAME} | grep -o "ARMv6"
+  if [ "${FORCE_INSTALL}" != "1" ]; then
+    NODEJS_VER=`node -v`
     if [ "$?" == "0" ]; then
-      cd /tmp
-      wget https://nodejs.org/dist/v${ARMv6_NODEJS_VERSION}/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
-      tar zxf node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
-      cd node-v${ARMv6_NODEJS_VERSION}-linux-armv6l/
-      cp -R * /usr/local/
+      for v in ${NODEJS_VERSIONS}
+      do
+        echo ${NODEJS_VER} | grep -oE "${v/./\\.}\..*"
+        if [ "$?" == "0" ]; then
+          unset NODEJS_VER
+        fi
+      done
     else
-      curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
-      apt-get install -y nodejs
+      NODEJS_VER="N/A"
+    fi
+    apt_get_update
+    if [ -n "${NODEJS_VER}" ]; then
+      info "Installing Node.js..."
+      MODEL_NAME=`cat /proc/cpuinfo | grep "model name"`
+      if [ "$?" != "0" ]; then
+        alert "Unsupported environment"
+        exit 1
+      fi
+      apt-get remove -y nodered nodejs nodejs-legacy npm
+      echo ${MODEL_NAME} | grep -o "ARMv6"
+      if [ "$?" == "0" ]; then
+        cd /tmp
+        wget https://nodejs.org/dist/v${ARMv6_NODEJS_VERSION}/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
+        tar zxf node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
+        cd node-v${ARMv6_NODEJS_VERSION}-linux-armv6l/
+        cp -R * /usr/local/
+      else
+        curl -sL https://deb.nodesource.com/setup_6.x | sudo bash -
+        apt-get install -y nodejs
+      fi
     fi
+    info "Installing dependencies..."
+    apt-get install -y python-dev python-rpi.gpio bluez libudev-dev
   fi
-  info "Installing dependencies..."
-  apt-get install -y python-dev python-rpi.gpio bluez libudev-dev
   cd ~
   npm cache clean
   info "Installing CANDY RED..."
-  WELCOME_FLOW_URL=${WELCOME_FLOW_URL} npm install -g --unsafe-perm candy-red
+  WELCOME_FLOW_URL=${WELCOME_FLOW_URL} \
+    NODES_CSV_PATH=${NODES_CSV_PATH} \
+    CANDY_RED_APT_GET_UPDATED=${CANDY_PI_LITE_APT_GET_UPDATED} \
+    npm install -g --unsafe-perm candy-red
   REBOOT=1
+  CANDY_PI_LITE_APT_GET_UPDATED=1
 }
 
 function test_boot_apn {