.github/workflows/notify.yml

@@ -15,5 +15,4 @@ jobs:
           GHTOKEN: ${{ secrets.GHTOKEN }}
           BOTTOKEN: ${{ secrets.BOTTOKEN }}
           CHATIDS: ${{ secrets.CHATIDS }}
-        # run: bash -x ./scripts/notify.sh
+        run: bash -x ./scripts/notify.sh
-        run: echo "暂时弃用通知"

README.md

@@ -1,18 +1,13 @@
 # wechat-windows-versions
 收集 Windows 微信版本并保存
 
-相关项目: 
-* [Mac微信收集](https://github.com/zsbai/wechat-versions)
-* [WindowsX86 版本收集(目前仅含23年6月12日后的)](https://github.com/tom-snow/wechat-windows-versions-x86)
-
 ## 目录结构
 ```shell
 ├── README.md # 自述文件
 ├── WeChatSetup # 微信安装包临时目录
 │   └── temp # 临时目录
 └── scripts   # 脚本目录
-    ├── destVersionRelease.sh # 获取安装包及取得版本号与 hash 值的脚本
+    └── destVersionRelease.sh # 获取安装包及取得版本号与 hash 值的脚本
-    └── notify.sh # 新release 时调用通知的脚本
 ```
 
 ## 说明

scripts/destVersionRelease.sh

@@ -28,7 +28,7 @@ function login_gh() {
     printf "#%.0s" {1..60}
     echo 
     if [ -z $GHTOKEN ]; then
-        >&2 echo -e "\033[1;31mMissing Github Token! Please get a GHToken from 'Github Settings->Developer settings->Personal access tokens' and set it in Repo Secrect\033[0m"
+        >&2 echo -e "\033[1;31mMissing Github Token! Please get a BotToken from 'Github Settings->Developer settings->Personal access tokens' and set it in Repo Secrect\033[0m"
         exit 1
     fi
 
@@ -62,15 +62,10 @@ function extract_version() {
     printf "#%.0s" {1..60}
     echo 
     
-    # old version
+    local outfile=`7z l ${temp_path}/WeChatSetup.exe | grep improve.xml | awk 'NR ==1 { print $NF }'`
-    #local outfile=`7z l ${temp_path}/WeChatSetup.exe | grep improve.xml | awk 'NR ==1 { print $NF }'`
     ## 7z x ${temp_path}/WeChatSetup.exe -o${temp_path}/temp "\$R5/Tencent/WeChat/improve.xml"
-    #7z x ${temp_path}/WeChatSetup.exe -o${temp_path}/temp $outfile
+    7z x ${temp_path}/WeChatSetup.exe -o${temp_path}/temp $outfile
-    # dest_version=`awk '/MinVersion/{ print $2 }' ${temp_path}/temp/$outfile | sed -e 's/^.*="//g' -e 's/".*$//g'`
+    dest_version=`awk '/MinVersion/{ print $2 }' ${temp_path}/temp/$outfile | sed -e 's/^.*="//g' -e 's/".*$//g'`
-    
-    # new version
-    7z x ${temp_path}/WeChatSetup.exe -o${temp_path}/temp
-    dest_version=`ls -l ${temp_path}/temp | awk '{print $9}' | grep '^\[[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\]$' | sed -e 's/^\[//g' -e 's/\]$//g'`
 }
 
 

scripts/notify.sh

@@ -4,17 +4,17 @@ set -eo pipefail
 
 
 if [ -z $GHTOKEN ]; then
-    >&2 echo -e "\033[1;31mMissing Github Token(GHTOKEN)! Please get a BotToken from 'Github Settings->Developer settings->Personal access tokens' and set it in Repo Secrect\033[0m"
+    >&2 echo -e "\033[1;31mMissing Github Token! Please get a BotToken from 'Github Settings->Developer settings->Personal access tokens' and set it in Repo Secrect\033[0m"
     exit 1
 fi
 
 if [ -z $BOTTOKEN ]; then
-    >&2 echo -e "\033[1;31mMissing Bot Token(BOTTOKEN)! Please get a BotToken from @Botfather on Telegram and set it in Repo Secrect\033[0m"
+    >&2 echo -e "\033[1;31mMissing Bot Token! Please get a BotToken from @Botfather on Telegram and set it in Repo Secrect\033[0m"
     exit 2
 fi
 
 if [ -z $CHATIDS ]; then
-    >&2 echo -e "\033[1;31mMissing ChatIds(CHATIDS)! Please get ChatId from @GroupIDbot on Telegram Chats(Muti chatids split with comma ',') and set it in Repo Environment Values\033[0m"
+    >&2 echo -e "\033[1;31mMissing ChatIds! Please get ChatId from @GroupIDbot on Telegram Chats(Muti chatids split with comma ',') and set it in Repo Environment Values\033[0m"
     exit 2
 fi