From a280658bbbc75a5ed222b6b068f08249ec6b7380 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sat, 18 Nov 2017 22:41:13 +0100 Subject: [PATCH] added xkeyring dep --- app/package.json | 1 + package.json | 1 + scripts/build-native.js | 6 ++---- scripts/vars.js | 2 +- terminus-settings/src/api.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/package.json b/app/package.json index 5aec0201..7f54ae29 100644 --- a/app/package.json +++ b/app/package.json @@ -29,6 +29,7 @@ "mz": "^2.6.0", "path": "0.12.7", "rxjs": "5.3.0", + "xkeychain": "0.0.6", "zone.js": "0.8.12" }, "devDependencies": { diff --git a/package.json b/package.json index 1f0524db..3f799441 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "libappindicator1", "libxtst6", "libnss3", + "python-gnomekeyring", "tmux" ], "artifactName": "terminus-${version}-${os}-${arch}.deb" diff --git a/scripts/build-native.js b/scripts/build-native.js index 806759c3..47f8ae09 100755 --- a/scripts/build-native.js +++ b/scripts/build-native.js @@ -3,7 +3,5 @@ const rebuild = require('electron-rebuild').default const path = require('path') const vars = require('./vars') -let buildPath = path.resolve(__dirname, '../terminus-terminal') -rebuild(buildPath, vars.electronVersion, process.arch, [], true).then(() => { - console.log('Done') -}) +rebuild(path.resolve(__dirname, '../app'), vars.electronVersion, process.arch, [], true) +rebuild(path.resolve(__dirname, '../terminus-terminal'), vars.electronVersion, process.arch, [], true) diff --git a/scripts/vars.js b/scripts/vars.js index d1cbedf9..bb9afe65 100755 --- a/scripts/vars.js +++ b/scripts/vars.js @@ -15,5 +15,5 @@ exports.builtinPlugins = [ 'terminus-community-color-schemes', 'terminus-plugin-manager', ] -exports.nativeModules = ['node-pty-tmp', 'font-manager'] +exports.nativeModules = ['node-pty-tmp', 'font-manager', 'xkeychain'] exports.electronVersion = pkgInfo.devDependencies.electron diff --git a/terminus-settings/src/api.ts b/terminus-settings/src/api.ts index 9542ab22..7a3de144 100644 --- a/terminus-settings/src/api.ts +++ b/terminus-settings/src/api.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core' -export declare type ComponentType = new (...args: any[]) => Component +export declare type ComponentType = new (...args: any[]) => any export abstract class SettingsTabProvider { id: string