From e92e10751240fa19828a4e031b31882055e7fdd1 Mon Sep 17 00:00:00 2001 From: msojocs Date: Wed, 26 Jan 2022 17:49:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8bash=E4=BC=98?= =?UTF-8?q?=E5=85=88=E5=AE=89=E8=A3=85node,=E6=8F=90=E9=AB=98=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 4 ++++ {tools => test}/pack | 0 test/path-node | 9 +++++++++ test/path-node2 | 3 +++ {tools => test}/test | 0 tools/setup-wechat-devtools-bash | 33 +++++++++++++++++++++++++++++++ tools/setup-wechat-devtools-node | 1 + tools/update-node-node | 3 ++- tools/update-wechat-devtools-node | 2 +- 9 files changed, 53 insertions(+), 2 deletions(-) rename {tools => test}/pack (100%) create mode 100644 test/path-node create mode 100644 test/path-node2 rename {tools => test}/test (100%) create mode 100644 tools/setup-wechat-devtools-bash diff --git a/readme.md b/readme.md index dc91afc..6d9557c 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,10 @@ git clone https://github.com/jiyeme/wechat-devtools.git ``` 4. 在本地项目目录中执行如下的语句,构筑开发者工具: ``` +./tools/setup-wechat-devtools-bash +``` +或者 +``` ./tools/setup-wechat-devtools-node ``` 5. 在本地项目目录中执行如下的语句,可以安装应用图标(非必须): diff --git a/tools/pack b/test/pack similarity index 100% rename from tools/pack rename to test/pack diff --git a/test/path-node b/test/path-node new file mode 100644 index 0000000..489e170 --- /dev/null +++ b/test/path-node @@ -0,0 +1,9 @@ +#!/bin/bash +root_dir=$(cd `dirname $0`/.. && pwd -P) + +echo $root_dir +export PATH="$root_dir/node/bin":$PATH + +node --version + +exec "$root_dir/test/path-node2" \ No newline at end of file diff --git a/test/path-node2 b/test/path-node2 new file mode 100644 index 0000000..8f09290 --- /dev/null +++ b/test/path-node2 @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +console.log(process.version) \ No newline at end of file diff --git a/tools/test b/test/test similarity index 100% rename from tools/test rename to test/test diff --git a/tools/setup-wechat-devtools-bash b/tools/setup-wechat-devtools-bash new file mode 100644 index 0000000..1893962 --- /dev/null +++ b/tools/setup-wechat-devtools-bash @@ -0,0 +1,33 @@ +#!/bin/bash + +root_dir=$(cd `dirname $0`/.. && pwd -P) + +echo "==========Initializing node==========" + +if [ -f "$root_dir/node/bin/node" ]; then + echo "node安装完毕" +else + exec "$root_dir/tools/update-node-node" +fi + +if [ ! -f "$root_dir/node/bin/node" ]; then + echo "Node安装失败" + exit +fi + +# 将node加入环境 +export PATH="$root_dir/node/bin":$PATH + +echo "==========Initializing nwjs==========" +if [ -f "$root_dir/nwjs/nw" ]; then + echo "nwjs安装完毕" +else + exec "$root_dir/tools/update-nwjs-node" +fi + +echo "==========Initializing wechat-devtools package==========" +if [ -f "$root_dir/package.nw/package.json" ]; then + echo "微信开发者工具安装完毕" +else + exec "$root_dir/tools/update-wechat-devtools-node" +fi \ No newline at end of file diff --git a/tools/setup-wechat-devtools-node b/tools/setup-wechat-devtools-node index 5837c04..55d9408 100644 --- a/tools/setup-wechat-devtools-node +++ b/tools/setup-wechat-devtools-node @@ -49,6 +49,7 @@ const init_nwjs = function () { }); }); }; + const init_wechat = function () { console.info( "==========Initializing wechat-devtools package==============" diff --git a/tools/update-node-node b/tools/update-node-node index c7778f8..ceb1d2c 100644 --- a/tools/update-node-node +++ b/tools/update-node-node @@ -5,6 +5,7 @@ const { execSync, spawn } = require("child_process"); const util = require("util"); const nodeConfig = require("../conf/node.json"); +const { exit } = require("process"); const download = function () { return new Promise((resolve, reject) => { @@ -102,7 +103,7 @@ const start = async () => { ); } catch (error) { console.error("异常", error); - throw error + exit(-1) } }; diff --git a/tools/update-wechat-devtools-node b/tools/update-wechat-devtools-node index 942624f..8b95ea2 100644 --- a/tools/update-wechat-devtools-node +++ b/tools/update-wechat-devtools-node @@ -291,7 +291,7 @@ const start = async () => { ); } catch (error) { console.error("异常", error); - throw error; + exit(-1) } }; start();