Merge branch 'hotfix/1.8.3'

CANDY-LINE · Feb 6, 2018 · 8840f4d · 8840f4d
2 parents 2e5fe38 + 86b6ded
commit 8840f4d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # 履歴
+* 1.8.3
+    - アンインストール時にエラーが出る問題を修正
+    - ASUS Tinker Board Sにおいて、機種判定がうまくいかない場合がある問題を修正
 * 1.8.2
     - ASUS Tinker Board Sに正式対応(ただしTinker OS 2.0.4以降に限る)
 * 1.8.1

diff --git a/README.md b/README.md
@@ -49,13 +49,11 @@ $ make PI_USER=linaro PI_HOST=tinkerboard.local
 ### 動作確認 (RPi/ATB)
 
 ```bash
-$ VERSION=1.8.2 && rm -fr tmp && mkdir tmp && cd tmp && \
+$ VERSION=1.8.3 && 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
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 CANDY_RED=0 BOOT_APN=soracom.io ./install.sh
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 CANDY_RED=0 BOOT_APN=soracom.io ENABLE_WATCHDOG=0 ./install.sh
-$ time sudo SRC_DIR=$(pwd) DEBUG=1 CANDY_RED=0 CONFIGURE_STATIC_IP_ON_BOOT=1 BOOT_APN=soracom.io ./install.sh
 $ time sudo SRC_DIR=$(pwd) DEBUG=1 CANDY_RED=0 BOOT_APN=soracom.io PPP_PING_INTERVAL_SEC=5 ./install.sh
 
 $ time sudo /opt/candy-line/candy-pi-lite/uninstall.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.8.2
+VERSION=1.8.3
 # Channel B
 UART_PORT="/dev/ttySC1"
 MODEM_BAUDRATE=${MODEM_BAUDRATE:-460800}
@@ -73,7 +73,7 @@ function setup {
     if [ "$?" == "0" ]; then
       BOARD="RPi"
     else
-      DT_MODEL=`cat /proc/device-tree/model 2>&1 | sed '/\x00/d'`
+      DT_MODEL=`cat /proc/board_info 2>&1`
       case ${DT_MODEL} in
         "Tinker Board" | "Tinker Board S")
           BOARD="ATB"

diff --git a/systemd/_pin_settings.sh b/systemd/_pin_settings.sh
@@ -27,13 +27,13 @@ else
     echo -e "\033[93m[FATAL] *** UNSUPPORTED OS *** \033[0m"
     exit 3
   fi
-  DT_MODEL=`cat /proc/device-tree/model 2>&1 | sed '/\x00/d'`
+  DT_MODEL=`cat /proc/board_info 2>&1`
   if [ -z "${DT_MODEL}" ]; then
     RESOLVE_MAX=30
     RESOLVE_COUNTER=0
     while [ ${RESOLVE_COUNTER} -lt ${RESOLVE_MAX} ];
     do
-      DT_MODEL=`cat /proc/device-tree/model 2>&1 | sed '/\x00/d'`
+      DT_MODEL=`cat /proc/board_info 2>&1`
       if [ -n "${DT_MODEL}" ]; then
         break
       fi

diff --git a/uninstall.sh b/uninstall.sh
@@ -41,6 +41,7 @@ function assert_root {
 }
 
 function setup {
+  echo
 }
 
 function uninstall_ppp {
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ function assert_root { @@
     }
     function setup {
+      echo
     }
     function uninstall_ppp {
@@ Expand Down @@