From a5bb4e44b92df2c6ccd3e29425ce428aac04d78e Mon Sep 17 00:00:00 2001 From: msojocs Date: Sun, 6 Mar 2022 22:53:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=88=E6=9C=AC=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E4=B8=8E=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/devtools_v | 1 + tools/setup-wechat-devtools-bash | 28 ++++++++++++++++++++++++---- tools/update-wechat-devtools-node | 7 +++++++ 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 conf/devtools_v diff --git a/conf/devtools_v b/conf/devtools_v new file mode 100644 index 0000000..106282a --- /dev/null +++ b/conf/devtools_v @@ -0,0 +1 @@ +1.05.2203030 \ No newline at end of file diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash index db0938a..02d7104 100755 --- a/tools/setup-wechat-devtools-bash +++ b/tools/setup-wechat-devtools-bash @@ -60,8 +60,28 @@ fi # export PATH="$root_dir/tmp/7z:$PATH" echo "==========Initializing wechat-devtools package==========" -if [ -f "$root_dir/package.nw/package.json" ]; then - success "微信开发者工具安装完毕" + +if [[ $@ == *version* ]];then + # 参数有版本号,优先级高,清空TARGET_VERSION + echo "参数有版本号" + TARGET_VERSION="" else - node "$root_dir/tools/update-wechat-devtools-node" $@ -fi \ No newline at end of file + # 参数没有版本号,获取 + echo "参数没有版本号" + TARGET_VERSION="version="$( cat "$root_dir/conf/devtools_v") +fi +echo "TARGET_VERSION: $TARGET_VERSION" +if [ ! -f "$root_dir/package.nw/package.json" ];then + # 没装,直接装 + node "$root_dir/tools/update-wechat-devtools-node" $TARGET_VERSION $@ + exit 0 +fi +# 装了,获取已安装版本 +DEVTOOLS_VERSION=$( cat "$root_dir/package.nw/package.json" | grep -m 1 -Eo "\"[0-9]{1}\.[0-9]{2}\.[0-9]+" ) +DEVTOOLS_VERSION="${DEVTOOLS_VERSION//\"/}" +# 已安装, 比较目标版本 +if [ "$TARGET_VERSION" == "$DEVTOOLS_VERSION" ];then + success "微信开发者工具安装完毕" + exit 0 +fi +node "$root_dir/tools/update-wechat-devtools-node" $TARGET_VERSION $@ diff --git a/tools/update-wechat-devtools-node b/tools/update-wechat-devtools-node index e847609..310528a 100755 --- a/tools/update-wechat-devtools-node +++ b/tools/update-wechat-devtools-node @@ -16,6 +16,8 @@ const urls = { }; const arguments = process.argv.slice(2); +console.log(arguments) + const args = {}; for (let arg of arguments) { let t = arg.split("="); @@ -334,6 +336,11 @@ const start = async () => { path.resolve(__dirname, "../package.nw/.build_time"), "" + parseInt(new Date().getTime() / 1000) ); + // 写入版本 + fs.writeFileSync( + path.resolve(__dirname, "../conf/devtools_v"), + version + ) console.log( `Succeeded upgrading wechat-devtools to version ${version}` );