From c98667236e535736f496e5c9e05ef246a22cf545 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 23 Mar 2018 22:34:26 +0400 Subject: [PATCH] tools: Fix reinstall script for working across all platforms. Make reinstall script compatible with Windows. Fixes #440. --- app/package-lock.json | 2 +- package.json | 2 +- tools/reinstall-node-modules.js | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 tools/reinstall-node-modules.js diff --git a/app/package-lock.json b/app/package-lock.json index 45a63426..15ec0860 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "zulip", - "version": "1.8.1", + "version": "1.8.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 55264a9d..d1a7a25f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "scripts": { "start": "electron app --disable-http-cache --no-electron-connect", - "reinstall": "./tools/reinstall-node-modules", + "reinstall": "node ./tools/reinstall-node-modules.js", "postinstall": "electron-builder install-app-deps", "test": "xo", "test-e2e": "gulp test-e2e", diff --git a/tools/reinstall-node-modules.js b/tools/reinstall-node-modules.js new file mode 100644 index 00000000..a176eb21 --- /dev/null +++ b/tools/reinstall-node-modules.js @@ -0,0 +1,18 @@ +#!/usr/bin/env node +const {exec} = require('child_process'); +const path = require('path'); + +const isWindows = process.platform === 'win32'; +const command = path.join(__dirname, `reinstall-node-modules${isWindows ? '.cmd' : ''}`); + +const proc = exec(command, error => { + if (error) { + console.error(error); + } +}); + +proc.stdout.on('data', data => console.log(data.toString())); +proc.stderr.on('data', data => console.error(data.toString())); +proc.on('exit', code => { + process.exit(code); +});