update: devtools to v1.06.2207210

This commit is contained in:
msojocs 2022-07-23 23:05:22 +08:00
parent 5ec4cbc186
commit b351a8945c
8 changed files with 34 additions and 29 deletions

View File

@ -1,3 +1,7 @@
# 1.06.2207210-1 / 2022-07-
- update: devtools to v1.06.2207210
-
# 1.06.2206090-2 / 2022-06-15 # 1.06.2206090-2 / 2022-06-15
- fix: deepin icon - fix: deepin icon

View File

@ -1 +1 @@
1.06.2206090,a2e0e0826571daeab239755d5b3347e5 1.06.2207210,7599cfeeebb57bda7ae5594daf2e0659

View File

@ -10,7 +10,7 @@
---- ----
[![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) [![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.06.2206090-yellow)](https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html) [![wechat-tools](https://img.shields.io/badge/wechat--devtools-1.06.2207210-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/) [![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/) [![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) [![aur](https://img.shields.io/aur/version/wechat-devtools)](https://aur.archlinux.org/packages/wechat-devtools)
@ -35,7 +35,7 @@
# 进度 # 进度
当前工具可以在Linux上构筑最新版 `1.06.2206090`支持CLI模式。 当前工具可以在Linux上构筑最新版 `1.06.2207210`支持CLI模式。
另现在已经可以直接在设置界面里面修改字体,手工输入字体名称就可以。 另现在已经可以直接在设置界面里面修改字体,手工输入字体名称就可以。
# 功能测试记录 # 功能测试记录

View File

@ -1,6 +1,6 @@
name: wechat-devtools # you probably want to 'snapcraft register <name>' name: wechat-devtools # you probably want to 'snapcraft register <name>'
base: core18 # the base snap is the execution environment for this snap base: core18 # the base snap is the execution environment for this snap
version: '1.06.2206090-2' # just for humans, typically '1.2+git' or '1.3.2' version: '1.06.2207210-1' # just for humans, typically '1.2+git' or '1.3.2'
summary: WeChat Devtools for Linux # 79 char long summary summary: WeChat Devtools for Linux # 79 char long summary
description: | description: |
WeChat Devtools for Linux. WeChat Devtools for Linux.
@ -32,7 +32,7 @@ parts:
ls -l $SNAPCRAFT_PART_INSTALL ls -l $SNAPCRAFT_PART_INSTALL
package-nw: package-nw:
plugin: dump plugin: dump
source: https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062206090&version_type=1 source: https://servicewechat.com/wxa-dev-logic/download_redirect?type=x64&from=mpwiki&download_version=1062207210&version_type=1
# source: cache/wechat_devtools_1.05.2204180_x64.exe # source: cache/wechat_devtools_1.05.2204180_x64.exe
source-type: 7z source-type: 7z
source-subdir: code source-subdir: code

View File

@ -45,23 +45,24 @@ fi
# wcc、wcsc处理设置WINE=fasle环境变量生效 # wcc、wcsc处理设置WINE=fasle环境变量生效
if [[ "$WINE" != 'true' ]];then if [[ "$WINE" != 'true' ]];then
# "wcc.exe":!0,"wcsc.exe":!0 # "wcc.exe":!0,"wcsc.exe":!0
find_result=$( grep -lr '{wcc:!0,wcsc:!0}' "$tmp_dir/core.wxvpkg" ) find_result=$( grep -lr 'wcc-exec' "$tmp_dir/core.wxvpkg" )
echo "wcc: $find_result" echo "wcc: $find_result"
if [[ ! -z $find_result ]];then if [[ ! -z $find_result ]];then
new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}' # new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}'
sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result" # sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result"
new_str='"linux"===process.platform' # new_str='"linux"===process.platform'
sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result" # sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result"
return_exp_wcc=$(cat $find_result | grep -P 'return [a-z]+\("wcc"\)' -o) # return ?("wcc") # return_exp_wcc=$(cat $find_result | grep -P 'return [a-z]+\("wcc"\)' -o) # return ?("wcc")
return_exp_wcc_replace="${return_exp_wcc//wcc/wcc.bin}" # return ?("wcc.bin") # return_exp_wcc_replace="${return_exp_wcc//wcc/wcc.bin}" # return ?("wcc.bin")
return_exp_wcc_replace="${return_exp_wcc//return /${return_exp_wcc_replace},}" # return ?("wcc.bin") # return_exp_wcc_replace="${return_exp_wcc//return /${return_exp_wcc_replace},}" # return ?("wcc.bin")
return_exp_wcsc=$(cat $find_result | grep -P 'return [a-z]+\("wcsc"\)' -o) # return ?("wcsc") # return_exp_wcsc=$(cat $find_result | grep -P 'return [a-z]+\("wcsc"\)' -o) # return ?("wcsc")
return_exp_wcsc_replace="${return_exp_wcc_replace//wcc/wcsc}" # return_exp_wcsc_replace="${return_exp_wcc_replace//wcc/wcsc}"
sed -i "s#$return_exp_wcc#$return_exp_wcc_replace#g" "$find_result" sed -i "s#wcc\\.exe#wcc#g" "$find_result"
sed -i "s#$return_exp_wcsc#$return_exp_wcsc_replace#g" "$find_result" sed -i "s#wcsc\\.exe#wcsc#g" "$find_result"
sed -i "s#code/package.nw#package.nw#g" "$find_result"
fi fi
# 处理报错时控制台显示的环境 # 处理报错时控制台显示的环境
find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" ) find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" )

View File

@ -26,10 +26,10 @@ ls -l "${srcdir}/compiler"
# 预览编译,设置 WINE!=true 环境变量生效 # 预览编译,设置 WINE!=true 环境变量生效
# 如果是mac执行wcc,否则wcc.exe # 如果是mac执行wcc,否则wcc.exe
if [[ "$WINE" != 'true' ]];then if [[ "$WINE" != 'true' ]];then
\cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js" # \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js"
\cp "${srcdir}/compiler/nodejs"/* "${package_dir}/js/vendor" \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/node_modules/wcc-exec"
cd "${package_dir}/js/vendor" && chmod 0755 wcc wcsc wcc.bin wcsc.bin cd "${package_dir}/node_modules/wcc-exec" && chmod 0755 wcc wcsc wcc.bin wcsc.bin
node "${package_dir}/js/vendor/generatemd5.js" # node "${package_dir}/js/vendor/generatemd5.js"
current=`date "+%Y-%m-%d %H:%M:%S"` current=`date "+%Y-%m-%d %H:%M:%S"`
timeStamp=`date -d "$current" +%s` timeStamp=`date -d "$current" +%s`

View File

@ -48,18 +48,18 @@ rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on li
cd "${package_dir}/node_modules/vscode-ripgrep" && \ cd "${package_dir}/node_modules/vscode-ripgrep" && \
mkdir -p tmp && cd tmp mkdir -p tmp && cd tmp
if [ "$ACTION_MODE" != "true" ]; then # if [ "$ACTION_MODE" != "true" ]; then
notice "非ACTION模式, 设置镜像源" # notice "非ACTION模式, 设置镜像源"
prefix="https://mirror.ghproxy.com/" # export https_proxy="http://127.0.0.1:7890"
fi # fi
wget ${prefix}https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz wget https://github.com/microsoft/ripgrep-prebuilt/releases/download/v12.1.1-1/ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -O ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz
tar xvf ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -C ../bin && \ tar xvf ripgrep-v12.1.1-1-x86_64-unknown-linux-musl.tar.gz -C ../bin && \
cd .. && rm -rf tmp cd .. && rm -rf tmp
(cd "${package_dir}/node_modules" && \ (cd "${package_dir}/node_modules" && \
find -name *.pdb | xargs -I{} rm -rf {} && \ find -name *.pdb | xargs -I{} rm -rf {} && \
find -name *.lib | xargs -I{} rm -rf {} && \ find -name *.lib | xargs -I{} rm -rf {} && \
find -name *.exe | xargs -I{} rm -rf {} && \ # find -name *.exe | xargs -I{} rm -rf {} && \
find -name *.dll | xargs -I{} rm -rf {}) # remove pdb debugging file find -name *.dll | xargs -I{} rm -rf {}) # remove pdb debugging file
rm -fr "${package_dir}/node_modules_tmp" # remove previous hacking tmp rm -fr "${package_dir}/node_modules_tmp" # remove previous hacking tmp

View File

@ -5,9 +5,9 @@
# version: latest - 最新 # version: latest - 最新
# x.xx.xxxxx - 指定版本号 # x.xx.xxxxx - 指定版本号
# #
set -e # 命令出错就退出
trap 'catchError $LINENO $BASH_COMMAND' SIGHUP SIGINT SIGQUIT EXIT # 捕获错误情况
set -e
trap 'catchError $LINENO "$BASH_COMMAND"' ERR # 捕获错误情况
catchError() { catchError() {
exit_code=$? exit_code=$?
if [ $exit_code -ne 0 ]; then if [ $exit_code -ne 0 ]; then