Merge branch 'master' of github.com:Eugeny/terminus

fixed #155
default to tmux if available on Linux
2025-08-01 15:06:59 +00:00 · 2017-08-04 14:42:06 +02:00 · 2017-08-04 14:41:36 +02:00 · 2017-08-04 14:40:49 +02:00 · 2017-08-04 13:39:41 +02:00
3 changed files with 10 additions and 5 deletions
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 </div>

 [![Build Status](https://travis-ci.org/Eugeny/terminus.svg?branch=master)](https://travis-ci.org/Eugeny/terminus) [![Build status](https://ci.appveyor.com/api/projects/status/wnnq4hm5mbd9rgoy?svg=true)](https://ci.appveyor.com/project/Eugeny/terminus) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Eugeny/terminus/master/LICENSE) [![Downloads](https://img.shields.io/badge/downloads-latest_release-brightgreen.svg)](https://github.com/Eugeny/terminus/releases/latest)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_shield)

 ----

@@ -45,3 +46,7 @@ Plugins can be installed directly from the Settings view inside Terminus.
 Pull requests and plugins are welcome! Publish your plugin on NPM with a `terminus-plugin` keyword to make them appear in the Plugin Manager.

 See [HACKING.md](https://github.com/Eugeny/terminus/blob/master/HACKING.md) for a very brief plugin development tutorial!
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FEugeny%2Fterminus?ref=badge_large)
--- a/terminus-terminal/src/components/terminalSettingsTab.component.pug
+++ b/terminus-terminal/src/components/terminalSettingsTab.component.pug
@@ -230,7 +230,7 @@
            )
                option(
                    *ngFor='let shell of shells',
-                    [ngValue]='shell.command'
+                    [ngValue]='shell.id'
                ) {{shell.name}}

        .form-group
--- a/terminus-terminal/src/config.ts
+++ b/terminus-terminal/src/config.ts
@@ -42,7 +42,7 @@ export class TerminalConfigProvider extends ConfigProvider {
        [Platform.macOS]: {
            terminal: {
                font: 'Menlo',
-                shell: '~default-shell~',
+                shell: 'default',
                persistence: 'screen',
            },
            hotkeys: {
@@ -74,7 +74,7 @@ export class TerminalConfigProvider extends ConfigProvider {
        [Platform.Windows]: {
            terminal: {
                font: 'Consolas',
-                shell: '~clink~',
+                shell: 'clink',
                persistence: null,
            },
            hotkeys: {
@@ -105,8 +105,8 @@ export class TerminalConfigProvider extends ConfigProvider {
        [Platform.Linux]: {
            terminal: {
                font: 'Liberation Mono',
-                shell: '~default-shell~',
-                persistence: 'screen',
+                shell: 'default',
+                persistence: 'tmux',
            },
            hotkeys: {
                'copy': [
Author	SHA1	Message	Date
Eugene Pankov	39183b1205	Merge branch 'master' of github.com:Eugeny/terminus	2017-08-04 14:42:06 +02:00
Eugene Pankov	36f82545ae	fixed #155	2017-08-04 14:41:36 +02:00
Eugene Pankov	1ef8343ea9	default to tmux if available on Linux	2017-08-04 14:40:49 +02:00
fossabot	c9e24819ae	Add license scan report and status	2017-08-04 13:39:41 +02:00