forked from wireapp/wire-desktop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into macos-tray
* master: New native module rebuilding (wireapp#643) Publish amplify events when joining calls (wireapp#629) Use new V8 inspector (wireapp#641) electron 1.6.9 (wireapp#637) Release 2.14.2743 Add template for github issues Update libsodium-neon to 2.1.0 (wireapp#634) Update electron-build-env to 0.2.0 (wireapp#633)
- Loading branch information
Showing
6 changed files
with
90 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| Wire Version: <Can be found in the About dialog> | ||
| Wire for Web Version: <Can be found in the About dialog> | ||
| OS: <OS/distribution and version number> | ||
| Do you have an antivirus software installed: <This helps us to find out if there are compatibility issues with antivirus software> | ||
|
|
||
| What steps will reproduce the problem? | ||
| 1. | ||
| 2. | ||
| 3. | ||
|
|
||
| What is the expected result? | ||
|
|
||
|
|
||
| What happens instead? | ||
|
|
||
|
|
||
| Please provide any additional information below. Attach a screenshot if | ||
| possible. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #!/usr/bin/env node | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2017 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| const spawn = require('cross-spawn'); | ||
| const exec = require('child_process').exec; | ||
| const arch = process.env.wire_target_arch ? process.env.wire_target_arch : process.arch; | ||
|
|
||
| const normalize = (args) => { | ||
| return args.map((arg) => { | ||
| Object.keys(process.env).forEach((key) => { | ||
| const variableRegex = new RegExp(`\\$${key}|%${key}%`, 'i'); | ||
| arg = arg.replace(variableRegex, process.env[key]); | ||
| }); | ||
| return arg; | ||
| }); | ||
| }; | ||
|
|
||
| let args = process.argv.slice(2); | ||
| if (args.length === 1) { | ||
| const [command] = normalize(args); | ||
| const proc = exec(command, (error, stdout, stderr) => { | ||
| if (error) { | ||
| console.error('Execution error:', error); | ||
| return; | ||
| } | ||
| process.stdout.write(stdout); | ||
| process.stderr.write(stderr); | ||
| process.exit(proc.code); | ||
| }); | ||
| } else { | ||
| args = normalize(args); | ||
| const command = args.shift(); | ||
| args.unshift('--arch', arch, '--'); | ||
| const proc = spawn.sync(command, args, {stdio: 'inherit'}); | ||
| process.exit(proc.status); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters