From b351a8945ca04b6dc19eb80aaf42424ea7535c6b Mon Sep 17 00:00:00 2001 From: msojocs Date: Sat, 23 Jul 2022 23:05:22 +0800 Subject: [PATCH] update: devtools to v1.06.2207210 --- changelog.md | 4 ++++ conf/devtools_v | 2 +- readme.md | 4 ++-- snap/snapcraft.yaml | 4 ++-- tools/fix-core.sh | 25 +++++++++++++------------ tools/fix-other.sh | 8 ++++---- tools/rebuild-node-modules.sh | 12 ++++++------ tools/setup-wechat-devtools-bash | 4 ++-- 8 files changed, 34 insertions(+), 29 deletions(-) diff --git a/changelog.md b/changelog.md index 5f3df3c..241ac46 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 1.06.2207210-1 / 2022-07- + +- update: devtools to v1.06.2207210 +- # 1.06.2206090-2 / 2022-06-15 - fix: deepin icon diff --git a/conf/devtools_v b/conf/devtools_v index b9e29c2..b6e21f1 100644 --- a/conf/devtools_v +++ b/conf/devtools_v @@ -1 +1 @@ -1.06.2206090,a2e0e0826571daeab239755d5b3347e5 \ No newline at end of file +1.06.2207210,7599cfeeebb57bda7ae5594daf2e0659 \ No newline at end of file diff --git a/readme.md b/readme.md index b259f33..9710047 100644 --- a/readme.md +++ b/readme.md @@ -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) -[![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/) [![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) @@ -35,7 +35,7 @@ # 进度 -当前工具可以在Linux上构筑最新版 `1.06.2206090`，支持CLI模式。 +当前工具可以在Linux上构筑最新版 `1.06.2207210`，支持CLI模式。 另现在已经可以直接在设置界面里面修改字体，手工输入字体名称就可以。 # 功能测试记录 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ed3a286..e3b6af4 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: wechat-devtools # you probably want to 'snapcraft register ' 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 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=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-type: 7z source-subdir: code diff --git a/tools/fix-core.sh b/tools/fix-core.sh index 6338d86..6ec84aa 100755 --- a/tools/fix-core.sh +++ b/tools/fix-core.sh @@ -45,23 +45,24 @@ fi # wcc、wcsc处理，设置WINE=fasle环境变量生效 if [[ "$WINE" != 'true' ]];then # "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" if [[ ! -z $find_result ]];then - new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}' - sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result" - new_str='"linux"===process.platform' - sed -i "s#\"darwin\"===process.platform#$new_str#g" "$find_result" + # new_str='{"wcc.bin":!0,"wcsc.bin":!0,wcc:!0,wcsc:!0}' + # sed -i "s#{wcc:!0,wcsc:!0}#$new_str#g" "$find_result" + # new_str='"linux"===process.platform' + # 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_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=$(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//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_replace="${return_exp_wcc_replace//wcc/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}" - sed -i "s#$return_exp_wcc#$return_exp_wcc_replace#g" "$find_result" - sed -i "s#$return_exp_wcsc#$return_exp_wcsc_replace#g" "$find_result" + sed -i "s#wcc\\.exe#wcc#g" "$find_result" + sed -i "s#wcsc\\.exe#wcsc#g" "$find_result" + sed -i "s#code/package.nw#package.nw#g" "$find_result" fi # 处理报错时控制台显示的环境 find_result=$( grep -lr '(env:' "$tmp_dir/core.wxvpkg" ) diff --git a/tools/fix-other.sh b/tools/fix-other.sh index 3f87583..023fa41 100755 --- a/tools/fix-other.sh +++ b/tools/fix-other.sh @@ -26,10 +26,10 @@ ls -l "${srcdir}/compiler" # 预览编译，设置 WINE!=true 环境变量生效 # 如果是mac执行wcc,否则wcc.exe if [[ "$WINE" != 'true' ]];then - \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js" - \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/js/vendor" - cd "${package_dir}/js/vendor" && chmod 0755 wcc wcsc wcc.bin wcsc.bin - node "${package_dir}/js/vendor/generatemd5.js" + # \cp -rf "${srcdir}/compiler/generatemd5.js" "${package_dir}/js/vendor/generatemd5.js" + \cp "${srcdir}/compiler/nodejs"/* "${package_dir}/node_modules/wcc-exec" + cd "${package_dir}/node_modules/wcc-exec" && chmod 0755 wcc wcsc wcc.bin wcsc.bin + # node "${package_dir}/js/vendor/generatemd5.js" current=`date "+%Y-%m-%d %H:%M:%S"` timeStamp=`date -d "$current" +%s` diff --git a/tools/rebuild-node-modules.sh b/tools/rebuild-node-modules.sh index b58fe26..62c651e 100755 --- a/tools/rebuild-node-modules.sh +++ b/tools/rebuild-node-modules.sh @@ -48,18 +48,18 @@ rm -fr "${package_dir}/node_modules/vscode-ripgrep/bin/"* # redownload bin on li cd "${package_dir}/node_modules/vscode-ripgrep" && \ mkdir -p tmp && cd tmp -if [ "$ACTION_MODE" != "true" ]; then - notice "非ACTION模式, 设置镜像源" - prefix="https://mirror.ghproxy.com/" -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 +# if [ "$ACTION_MODE" != "true" ]; then +# notice "非ACTION模式, 设置镜像源" +# export https_proxy="http://127.0.0.1:7890" +# fi +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 && \ cd .. && rm -rf tmp (cd "${package_dir}/node_modules" && \ find -name *.pdb | 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 rm -fr "${package_dir}/node_modules_tmp" # remove previous hacking tmp diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash index faaf16b..ed259a7 100755 --- a/tools/setup-wechat-devtools-bash +++ b/tools/setup-wechat-devtools-bash @@ -5,9 +5,9 @@ # version: latest - 最新 # x.xx.xxxxx - 指定版本号 # -set -e # 命令出错就退出 -trap 'catchError $LINENO $BASH_COMMAND' SIGHUP SIGINT SIGQUIT EXIT # 捕获错误情况 +set -e +trap 'catchError $LINENO "$BASH_COMMAND"' ERR # 捕获错误情况 catchError() { exit_code=$? if [ $exit_code -ne 0 ]; then