Merge branch 'hotfix/1.8.2'

CANDY-LINE · Feb 5, 2018 · 2e5fe38 · 2e5fe38
2 parents d0e9649 + f35223b
commit 2e5fe38
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # 履歴
+* 1.8.2
+    - ASUS Tinker Board Sに正式対応(ただしTinker OS 2.0.4以降に限る)
 * 1.8.1
     - ボード種類を指定しても無視される問題を修正（Raspberry Pi及びASUS Tinker Board利用者への影響はありません）
 * 1.8.0
-    - ASUS Tinker Board/ASUS Tinker Board Sへ正式対応(ただしTinker OS 2.0.4以降に限る)
+    - ASUS Tinker Board ~~/ASUS Tinker Board S~~ へ正式対応(ただしTinker OS 2.0.4以降に限る)
     - デフォルトルートをppp0に設定してそのまま固定する機能を無効にするオプションを追加
 * 1.7.3
     - USB接続時に`candy`コマンドが動作しない問題を修正

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ $ make PI_USER=linaro PI_HOST=tinkerboard.local
 ### 動作確認 (RPi/ATB)
 
 ```bash
-$ VERSION=1.8.1 && rm -fr tmp && mkdir tmp && cd tmp && \
+$ VERSION=1.8.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.8.1
+VERSION=1.8.2
 # Channel B
 UART_PORT="/dev/ttySC1"
 MODEM_BAUDRATE=${MODEM_BAUDRATE:-460800}
@@ -75,7 +75,7 @@ function setup {
     else
       DT_MODEL=`cat /proc/device-tree/model 2>&1 | sed '/\x00/d'`
       case ${DT_MODEL} in
-        "Tinker Board")
+        "Tinker Board" | "Tinker Board S")
           BOARD="ATB"
           ;;
         *)

diff --git a/systemd/_pin_settings.sh b/systemd/_pin_settings.sh
@@ -42,13 +42,13 @@ else
     done
   fi
   case ${DT_MODEL} in
-    "Tinker Board")
+    "Tinker Board" | "Tinker Board S")
       LED2=17
       PERST=187
       W_DISABLE=239
       ;;
     *)
-      echo -e "\033[93m[FATAL] *** UNSUPPORTED BOARD *** \033[0m"
+      log "[FATAL] UNSUPPORTED BOARD => [${DT_MODEL}]"
       exit 3
       ;;
   esac

diff --git a/uninstall.sh b/uninstall.sh
@@ -41,30 +41,6 @@ function assert_root {
 }
 
 function setup {
-  if [ -z "${BOARD}" ]; then
-    python -c "import RPi.GPIO" > /dev/null 2>&1
-    if [ "$?" == "0" ]; then
-      BOARD="RPi"
-    else
-      DT_MODEL=`cat /proc/device-tree/model 2>&1 | sed '/\x00/d'`
-      case ${DT_MODEL} in
-        "Tinker Board")
-          BOARD="ATB"
-          ;;
-        *)
-          BOARD=""
-          ;;
-      esac
-    fi
-  fi
-  case ${BOARD} in
-    RPi|ATB)
-      ;;
-    *)
-      err "Unsupported board: ${BOARD}"
-      exit 5
-      ;;
-  esac
 }
 
 function uninstall_ppp {