From f740195ce4ca2c88e3d82e0526d9ebd46e0466d5 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 10 Mar 2016 15:17:43 -0800 Subject: [PATCH 1/2] package: use APP_NAME variable --- bin/package.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/package.js b/bin/package.js index f5a188f2..4d4b02e2 100755 --- a/bin/package.js +++ b/bin/package.js @@ -1,5 +1,10 @@ #!/usr/bin/env node +/** + * Builds app binaries for OS X, Linux, and Windows. + */ + +var config = require('../config') var cp = require('child_process') var electronPackager = require('electron-packager') var fs = require('fs') @@ -30,6 +35,9 @@ var all = { // package(s). ignore: /^\/(dist|static\/screenshot.png)$/, + // The application name. + name: config.APP_NAME, + // The base directory where the finished package(s) are created. out: path.join(__dirname, '..', 'dist'), @@ -68,7 +76,7 @@ var win32 = { 'version-string': { // Company that produced the file. - CompanyName: 'WebTorrent', + CompanyName: config.APP_NAME, // Copyright notices that apply to the file. This should include the full text of all // notices, legal symbols, copyright dates, and so on. @@ -83,12 +91,12 @@ var win32 = { OriginalFilename: 'WebTorrent.exe', // Name of the product with which the file is distributed. - ProductName: 'WebTorrent', + ProductName: config.APP_NAME, // Internal name of the file, if one exists, for example, a module name if the file // is a dynamic-link library. If the file has no internal name, this string should be // the original filename, without extension. This string is required. - InternalName: 'WebTorrent' + InternalName: config.APP_NAME }, // Application icon. From fbddb0c98bfb1f8c7449564f80c9634a41337acd Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Thu, 10 Mar 2016 15:18:02 -0800 Subject: [PATCH 2/2] Add cleanup script (for developers) (Fix #124) --- bin/cleanup.js | 19 +++++++++++++++++++ bin/update-authors.sh | 1 + package.json | 3 +++ 3 files changed, 23 insertions(+) create mode 100755 bin/cleanup.js diff --git a/bin/cleanup.js b/bin/cleanup.js new file mode 100755 index 00000000..f99bc2a2 --- /dev/null +++ b/bin/cleanup.js @@ -0,0 +1,19 @@ +#!/usr/bin/env node + +/** + * Remove all traces of WebTorrent.app from the system (config and temp files). + * Useful for developers. + */ + +var applicationConfigPath = require('application-config-path') +var config = require('../config') +var os = require('os') +var path = require('path') +var pathExists = require('path-exists') +var rimraf = require('rimraf') + +var tmpPath = path.join(pathExists.sync('/tmp') ? '/tmp' : os.tmpDir(), 'webtorrent') +var configPath = applicationConfigPath(config.APP_NAME) + +rimraf.sync(configPath) +rimraf.sync(tmpPath) diff --git a/bin/update-authors.sh b/bin/update-authors.sh index 1e31b41a..172061cf 100755 --- a/bin/update-authors.sh +++ b/bin/update-authors.sh @@ -1,4 +1,5 @@ #!/bin/sh + # Update AUTHORS.md based on git history. git log --reverse --format='%aN <%aE>' | perl -we ' diff --git a/package.json b/package.json index 800049f0..ce4479d3 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,8 @@ "devDependencies": { "electron-packager": "^5.0.0", "electron-prebuilt": "0.36.10", + "path-exists": "^2.1.0", + "rimraf": "^2.5.2", "standard": "^6.0.5" }, "homepage": "https://webtorrent.io", @@ -45,6 +47,7 @@ "url": "git://github.com/feross/webtorrent-app.git" }, "scripts": { + "cleanup": "node ./bin/cleanup.js", "debug": "DEBUG=* electron .", "package": "node ./bin/package.js", "start": "electron .",