From acf6275304f84a46877266d3049f54c4e5b4a34c Mon Sep 17 00:00:00 2001 From: msojocs Date: Sun, 30 Jan 2022 10:06:12 +0800 Subject: [PATCH] =?UTF-8?q?update:=20mew=E5=B7=A5=E5=85=B7=E7=A7=BB?= =?UTF-8?q?=E8=87=B3old=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=A2=9E=E5=8A=A0nwjs?= =?UTF-8?q?=E4=B8=8Enode=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/nwjs.json | 40 +++++++++++++++++++++++++- tools/{ => old}/fix-cli | 0 tools/{ => old}/fix-package-name | 0 tools/{ => old}/fix-selection-copy | 0 tools/{ => old}/install-desktop-icon | 0 tools/{ => old}/patch-wechat-devtools | 0 tools/{ => old}/setup-wechat-devtools | 0 tools/{ => old}/update-node | 0 tools/{ => old}/update-nwjs | 0 tools/{ => old}/update-wechat-devtools | 0 tools/rebuild-node-modules | 2 +- tools/update-node-node | 11 +++++++ 12 files changed, 51 insertions(+), 2 deletions(-) rename tools/{ => old}/fix-cli (100%) mode change 100755 => 100644 rename tools/{ => old}/fix-package-name (100%) mode change 100755 => 100644 rename tools/{ => old}/fix-selection-copy (100%) mode change 100755 => 100644 rename tools/{ => old}/install-desktop-icon (100%) mode change 100755 => 100644 rename tools/{ => old}/patch-wechat-devtools (100%) mode change 100755 => 100644 rename tools/{ => old}/setup-wechat-devtools (100%) mode change 100755 => 100644 rename tools/{ => old}/update-node (100%) mode change 100755 => 100644 rename tools/{ => old}/update-nwjs (100%) mode change 100755 => 100644 rename tools/{ => old}/update-wechat-devtools (100%) mode change 100755 => 100644 diff --git a/conf/nwjs.json b/conf/nwjs.json index 0162a47..9f2bd59 100644 --- a/conf/nwjs.json +++ b/conf/nwjs.json @@ -1,4 +1,42 @@ { "version": "0.53.1", - "url": "https://oss.npmmirror.com/dist/nwjs/v${version}/nwjs-sdk-v${version}-linux-x64.tar.gz" + "url": "https://oss.npmmirror.com/dist/nwjs/v${version}/nwjs-sdk-v${version}-linux-x64.tar.gz", + "nw2node": { + "0.60.0": "17.3.0", + "0.59.1": "17.1.0", + "0.59.0": "17.1.0", + "0.58.0": "16.10.0", + "0.57.1": "16.10.0", + "0.57.0": "16.9.1", + "0.56.1": "16.9.1", + "0.56.0": "16.4.2", + "0.55.0": "16.4.2", + "0.54.1": "16.4.0", + "0.54.0": "16.1.0", + "0.53.1": "16.1.0", + "0.53.0": "15.14.0", + "0.52.2": "15.12.0", + "0.52.1": "15.12.0", + "0.52.0": "15.10.0", + "0.51.2": "15.8.1", + "0.51.1": "15.8.1", + "0.51.0": "15.5.1", + "0.50.3": "15.5.1", + "0.50.2": "15.3.0", + "0.50.1": "15.3.0", + "0.50.0": "15.0.1", + "0.49.2": "15.0.1", + "0.49.1": "14.13.1", + "0.49.0": "14.12.0", + "0.48.4": "14.12.0", + "0.48.3": "14.12.0", + "0.48.2": "14.10.1", + "0.48.1": "14.9.0", + "0.48.0": "14.8.0", + "0.47.3": "14.8.0", + "0.47.2": "14.7.0", + "0.47.1": "14.6.0", + "0.47.0": "14.5.0", + "0.46.4": "14.5.0" + } } \ No newline at end of file diff --git a/tools/fix-cli b/tools/old/fix-cli old mode 100755 new mode 100644 similarity index 100% rename from tools/fix-cli rename to tools/old/fix-cli diff --git a/tools/fix-package-name b/tools/old/fix-package-name old mode 100755 new mode 100644 similarity index 100% rename from tools/fix-package-name rename to tools/old/fix-package-name diff --git a/tools/fix-selection-copy b/tools/old/fix-selection-copy old mode 100755 new mode 100644 similarity index 100% rename from tools/fix-selection-copy rename to tools/old/fix-selection-copy diff --git a/tools/install-desktop-icon b/tools/old/install-desktop-icon old mode 100755 new mode 100644 similarity index 100% rename from tools/install-desktop-icon rename to tools/old/install-desktop-icon diff --git a/tools/patch-wechat-devtools b/tools/old/patch-wechat-devtools old mode 100755 new mode 100644 similarity index 100% rename from tools/patch-wechat-devtools rename to tools/old/patch-wechat-devtools diff --git a/tools/setup-wechat-devtools b/tools/old/setup-wechat-devtools old mode 100755 new mode 100644 similarity index 100% rename from tools/setup-wechat-devtools rename to tools/old/setup-wechat-devtools diff --git a/tools/update-node b/tools/old/update-node old mode 100755 new mode 100644 similarity index 100% rename from tools/update-node rename to tools/old/update-node diff --git a/tools/update-nwjs b/tools/old/update-nwjs old mode 100755 new mode 100644 similarity index 100% rename from tools/update-nwjs rename to tools/old/update-nwjs diff --git a/tools/update-wechat-devtools b/tools/old/update-wechat-devtools old mode 100755 new mode 100644 similarity index 100% rename from tools/update-wechat-devtools rename to tools/old/update-wechat-devtools diff --git a/tools/rebuild-node-modules b/tools/rebuild-node-modules index 7b20307..c750bf2 100755 --- a/tools/rebuild-node-modules +++ b/tools/rebuild-node-modules @@ -41,6 +41,7 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node" extract-file-icon \ native-keymap \ node-pty \ + native-watchdog \ oniguruma \ spdlog@0.11.1 \ trash \ @@ -58,7 +59,6 @@ rm -fr "${package_dir}/node_modules_tmp/node_modules/spdlog-node" mkdir -p "${package_dir}/node_modules/vscode-ripgrep/bin" cp -fr "${package_dir}/node_modules_tmp/node_modules/vscode-ripgrep/bin/rg" "${package_dir}/node_modules/vscode-ripgrep/bin/rg" -cd "${package_dir}/node_modules_tmp" && npm install native-watchdog --save rm -rf "${package_dir}/node_modules/native-watchdog" && cp -fr "${package_dir}/node_modules_tmp/node_modules/native-watchdog" "${package_dir}/node_modules" rm -rf "${package_dir}/node_modules_tmp" diff --git a/tools/update-node-node b/tools/update-node-node index 96403a2..0051e06 100644 --- a/tools/update-node-node +++ b/tools/update-node-node @@ -97,9 +97,20 @@ const upgrade = function (extractPath) { const start = async () => { try { + const nodePath = path.resolve(__dirname, "../node/bin/node") + if(fs.existsSync(nodePath)){ + const version = execSync(`${path.resolve(__dirname, "../node/bin/node")} --version`).toString().replace('\n', '') + if(version === `v${nodeConfig.version}`){ + console.log(`Node版本：${version} 已经安装，忽略`) + exit(0) + }else{ + console.log(`已安装Node版本：${version}，将要安装v${nodeConfig.version}`) + } + } const localPath = await download(); const extractPath = await extract(localPath); await upgrade(extractPath); + execSync(`${path.resolve(__dirname, "../node/bin/npm")} install node-gyp`) console.log( `Succeeded upgrading nodeConfig to version ${nodeConfig.version}`