From 60b3ff31f7386a9380466146e14fce44dc6a8d04 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Fri, 4 Mar 2022 23:13:19 +0800
Subject: [PATCH 1/2] update: PKGBUILD

---
 .gitignore       |  3 ++-
 res/aur/PKGBUILD | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 res/aur/PKGBUILD

diff --git a/.gitignore b/.gitignore
index 225bbab..de3505e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ build
 *.AppImage
 appimage-builder-cache
 wcc.bin
-wcsc.bin
\ No newline at end of file
+wcsc.bin
+temp.sh
\ No newline at end of file
diff --git a/res/aur/PKGBUILD b/res/aur/PKGBUILD
old mode 100755
new mode 100644
index 7bbcbce..2a95fc8
--- a/res/aur/PKGBUILD
+++ b/res/aur/PKGBUILD
@@ -7,9 +7,11 @@
 # https://github.com/dragonation/wechat-devtools
 # https://github.com/cytle/wechat_web_devtools
 
-_wechat_devtools_ver="1.05.2201240"
-_wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe"
-_wechat_devtools_md5="85552bae33e98eb186c5068419efce03"
+_wechat_devtools_ver="1.05.2203030"
+# https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1052203030&version_type=1
+_wechat_devtools_url="https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=${_wechat_devtools_ver//\./}&version_type=1"
+# _wechat_devtools_url="https://dldir1.qq.com/WechatWebDev/release/p-ae42ee2cde4d42ee80ac60b35f183a99/wechat_devtools_1.05.2201240_x64.exe"
+_wechat_devtools_md5="63cb0e75df3704e155185d900258ac1e"
 
 _wechat_devtools_exe="wechat_devtools_${_wechat_devtools_ver}_x64.exe"
 _nwjs_ver="0.53.1"
@@ -18,7 +20,7 @@ _node_version="16.1.0"
 
 pkgname=wechat-devtools
 pkgver="${_wechat_devtools_ver}"  # 主版本号
-pkgrel=15   # 次版本号release
+pkgrel=1   # 次版本号release
 epoch=2    # 大版本迭代强制更新（维护者变更，尽量不用）
 pkgdesc="WeChat Devtools For Linux. "
 arch=("x86_64")

From 2d7d8269ebafad96174f978769e4be74474ee660 Mon Sep 17 00:00:00 2001
From: msojocs <jiyecafe@gmail.com>
Date: Fri, 4 Mar 2022 23:16:35 +0800
Subject: [PATCH 2/2] add: version of devtools

---
 tools/build-appimage.sh | 4 +++-
 tools/build-deb.sh      | 4 +++-
 tools/build-tar.sh      | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/build-appimage.sh b/tools/build-appimage.sh
index be6854f..dc33f57 100755
--- a/tools/build-appimage.sh
+++ b/tools/build-appimage.sh
@@ -60,6 +60,8 @@ cd "$app_dir"
 
 # appimagetool $app_dir
 notice "MAKE APPIMAGE"
-"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.AppImage"
+ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
+ver="${ver//\"/}"
+"$tmp_dir/appimagetool-x86_64.AppImage" "$app_dir" "$build_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.AppImage"
 
 rm -rf $app_dir
\ No newline at end of file
diff --git a/tools/build-deb.sh b/tools/build-deb.sh
index aea30fe..16b7a63 100755
--- a/tools/build-deb.sh
+++ b/tools/build-deb.sh
@@ -46,4 +46,6 @@ notice "BUILD DEB Package"
 cd "$root_dir/tmp/deb"
 ls -l "$root_dir/tmp/deb"
 mkdir -p "$root_dir/tmp/build"
-dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_$BUILD_VERSION.deb"
+ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
+ver="${ver//\"/}"
+dpkg-deb -b . "$root_dir/tmp/build/WeChat_Dev_Tools_${ver}_$BUILD_VERSION.deb"
diff --git a/tools/build-tar.sh b/tools/build-tar.sh
index 157bd35..e1469f4 100755
--- a/tools/build-tar.sh
+++ b/tools/build-tar.sh
@@ -49,6 +49,9 @@ rm -rf "$build_dir/nwjs/node"
 \cp -rf "$root_dir/node/bin/node" "$build_dir/nwjs/node"
 notice "COPY package.nw"
 \cp -rf "$root_dir/package.nw" "$build_dir/package.nw"
+
 notice "MAKE tar.gz"
-cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}"
+ver=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" )
+ver="${ver//\"/}"
+cd "$tmp_dir/tar" && tar -zcf "$store_dir/WeChat_Dev_Tools_${ver}_${VERSION}_${ARCH}_${TYPE}.tar.gz" "WeChat_Dev_Tools_${VERSION}_${ARCH}_${TYPE}"
 rm -rf $build_dir
\ No newline at end of file