From 49d9077c66db90a3bec53d199890e4fa0b4dd5c5 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Tue, 26 Apr 2022 13:30:06 +0800
Subject: [PATCH] update: devtools 1.05.2204250

---
 .husky/pre-commit   | 28 +++++++++++++++++++++-------
 changelog.md        |  2 ++
 conf/devtools_v     |  2 +-
 readme.md           |  3 ++-
 snap/snapcraft.yaml |  4 ++--
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 1fd22d6..db80f30 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -11,20 +11,34 @@ VERSION_DATA=(${VERSION_DATA//,/ })
 TARGET_VERSION=${VERSION_DATA[0]}
 TARGET_VERSION_MD5=${VERSION_DATA[1]}
 
-LATEST_TAG=$(git describe --abbrev=0)
-
 # 检查snapcraft主版本号是否正确
-SNAP_VERSION=$(find $root_dir/snap -name "snapcraft.yaml" | xargs grep -P "'\d+\.\d+\.\d+-\d+" -o)
-if [ "v${SNAP_VERSION//\'/}" != "$LATEST_TAG" ];then
+SNAP_VERSION=$(grep -P "'\d+\.\d+\.\d{5,}" -o $root_dir/snap/snapcraft.yaml)
+if [ "${SNAP_VERSION//\'/}" != "$TARGET_VERSION" ];then
     echo "SNAP版本不正确!!!"
-    echo "SNAP版本: v${SNAP_VERSION//\'/} != 最新TAG: $LATEST_TAG"
+    echo "SNAP版本: ${SNAP_VERSION//\'/} != 目标版本: $TARGET_VERSION"
+    exit 1
+fi
+
+# 检查readme中的版本
+README_VERSION=$(grep -P '\-\d+\.\d+\.\d{5,}-' -o "$root_dir/readme.md")
+if [ "${README_VERSION//-/}" != "${TARGET_VERSION}" ];then
+    echo "README中版本不正确!!!"
+    echo "README中版本: ${README_VERSION//-/} != 目标版本: ${TARGET_VERSION}"
     exit 1
 fi
 
 # 检查snapcraft构建时下载的工具版本号是否正确
-SNAP_DEVTOOL_VERSION=$(find $root_dir/snap -name "snapcraft.yaml" | xargs grep -P "=\d+\d+\d{5,}" -o)
+SNAP_DEVTOOL_VERSION=$(cat $root_dir/snap/snapcraft.yaml | grep -P "=\d+\d+\d{5,}" -o)
 if [ "${SNAP_DEVTOOL_VERSION//=/}" != "${TARGET_VERSION//./}" ];then
-    echo "SNAP工具版本不匹配!!!"
+    echo "SNAP工具版本不正确!!!"
     echo "snap下载版本: ${SNAP_DEVTOOL_VERSION//=/} != 目标版本: ${TARGET_VERSION//./}"
     exit 1
 fi
+
+# LATEST_TAG=$(git describe --abbrev=0)
+# SNAP_VERSION=$(grep -P "'\d+\.\d+\.\d+-\d+" -o $root_dir/snap/snapcraft.yaml)
+# if [ "v${SNAP_VERSION//\'/}" != "$LATEST_TAG" ];then
+#     echo "SNAP版本与TAG不符!!!"
+#     echo "SNAP版本: v${SNAP_VERSION//\'/} != 最新TAG: $LATEST_TAG"
+#     exit 1
+# fi
diff --git a/changelog.md b/changelog.md
index 2828edd..f049ca7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+# 1.05.2204250-1 / 2022-
+- update: devtools 1.05.2204250
 
 # 1.05.2204180-2 / 2022-04-26
 - feat: wcc,wcsc node模块懒加载template解析支持
diff --git a/conf/devtools_v b/conf/devtools_v
index d071cf3..a2a0d4f 100644
--- a/conf/devtools_v
+++ b/conf/devtools_v
@@ -1 +1 @@
-1.05.2204180,0cd12ab05211bb88c56aa38f8de76a1a
\ No newline at end of file
+1.05.2204250,0073a70263614777fc41f21afbfc377d
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 5ebecd7..e75cdfa 100644
--- a/readme.md
+++ b/readme.md
@@ -10,10 +10,11 @@
 ----
 
 [![Node.js CI](https://github.com/msojocs/wechat-devtools-linux/actions/workflows/release.yml/badge.svg)](https://github.com/msojocs/wechat-devtools-linux/actions/workflows/release.yml)
-[![wechat-tools](https://img.shields.io/badge/wechat--devtools-1.05.2204180-yellow)](https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html)
+[![wechat-tools](https://img.shields.io/badge/wechat--devtools-1.05.2204250-yellow)](https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html)
 [![nwjs](https://img.shields.io/badge/nwjs-0.55.0-green)](https://nwjs.io/downloads/)
 [![node](https://img.shields.io/badge/node-16.4.2-orange)](https://nodejs.org/en/)
 [![aur](https://img.shields.io/aur/version/wechat-devtools)](https://aur.archlinux.org/packages/wechat-devtools)
+[![wechat-devtools](https://snapcraft.io/wechat-devtools/badge.svg)](https://snapcraft.io/wechat-devtools)
 
   这是微信开发者工具 Linux版
   
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d3a769a..0d01564 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: wechat-devtools # you probably want to 'snapcraft register <name>'
 base: core18 # the base snap is the execution environment for this snap
-version: '1.05.2204180-2' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.05.2204250-1' # just for humans, typically '1.2+git' or '1.3.2'
 summary: WeChat Devtools for Linux  # 79 char long summary
 description: |
   WeChat Devtools for Linux.
@@ -32,7 +32,7 @@ parts:
       ls -l $SNAPCRAFT_PART_INSTALL
   package-nw:
     plugin: dump
-    source: https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052204180&version_type=1
+    source: https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052204250&version_type=1
     # source: cache/wechat_devtools_1.05.2204180_x64.exe
     source-type: 7z
     source-subdir: code