Skip to content

Commit

Permalink
project rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Eugeny committed Jun 29, 2021
1 parent c61be3d commit 43cd331
Show file tree
Hide file tree
Showing 609 changed files with 510 additions and 530 deletions.
18 changes: 9 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,55 @@ updates:
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-core"
directory: "/tabby-core"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-settings"
directory: "/tabby-settings"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-terminal"
directory: "/tabby-terminal"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-local"
directory: "/tabby-local"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-community-color-schemes"
directory: "/tabby-community-color-schemes"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-electron"
directory: "/tabby-electron"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-web"
directory: "/tabby-web"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-plugin-manager"
directory: "/tabby-plugin-manager"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 20
- package-ecosystem: npm
directory: "/terminus-ssh"
directory: "/tabby-ssh"
schedule:
interval: daily
time: "04:00"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# DEBUG: electron-builder,electron-builder:*

- name: Build web resources
run: zsh -c 'tar czf terminus-web.tar.gz (terminus-*|web)/dist'
run: zsh -c 'tar czf tabby-web.tar.gz (tabby-*|web)/dist'

- name: Upload symbols
run: |
Expand All @@ -68,7 +68,7 @@ jobs:
mkdir artifact-tar.gz
mv dist/*.tar.gz artifact-tar.gz/ || true
mkdir artifact-web
mv terminus-web.tar.gz artifact-web/ || true
mv tabby-web.tar.gz artifact-web/ || true
- uses: actions/upload-artifact@master
name: Upload DEB
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ docs/api
sentry.properties
sentry-symbols.js

terminus-ssh/util/pagent.exe
tabby-ssh/util/pagent.exe
*.psd
36 changes: 0 additions & 36 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"protocol": "inspector",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"env": {
"TERMINUS_DEV": "1"
"TABBY_DEV": "1"
},
"runtimeArgs": [
"--remote-debugging-port=9223",
Expand Down
36 changes: 18 additions & 18 deletions HACKING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Some background

Terminus is an Electron app, with the frontend written in Typescript with the help of Angular framework. It's built using Webpack.
Tabby is an Electron app, with the frontend written in Typescript with the help of Angular framework. It's built using Webpack.

# Getting started

Expand Down Expand Up @@ -34,7 +34,7 @@ Now, check if your build is working:
yarn run build
```

Start Terminus with
Start Tabby with

```
yarn start
Expand All @@ -58,26 +58,26 @@ The artifacts will be produced in the `dist` folder.

# Project layout
```
terminus
tabby
├─ app # Electron app, just the bare essentials
| ├─ src # Electron renderer code
| └─ main.js # Electron main entry point
├─ build
├─ clink # Clink distributive, for Windows
├─ scripts # Maintenance scripts
├─ terminus-community-color-schemes # Plugin that provides color schemes
├─ terminus-core # Plugin that provides base UI and tab management
├─ terminus-electron # Plugin that provides Electron-specific functions
├─ terminus-local # Plugin that provides local shells and profiles
├─ terminus-plugin-manager # Plugin that installs other plugins
├─ terminus-settings # Plugin that provides the settings tab
├─ terminus-terminal # Plugin that provides terminal tabs
└─ terminus-web # Plugin that provides web-specific functions
├─ tabby-community-color-schemes # Plugin that provides color schemes
├─ tabby-core # Plugin that provides base UI and tab management
├─ tabby-electron # Plugin that provides Electron-specific functions
├─ tabby-local # Plugin that provides local shells and profiles
├─ tabby-plugin-manager # Plugin that installs other plugins
├─ tabby-settings # Plugin that provides the settings tab
├─ tabby-terminal # Plugin that provides terminal tabs
└─ tabby-web # Plugin that provides web-specific functions
```

# Plugin layout
```
terminus-pluginname
tabby-pluginname
├─ src # Typescript code
| ├─ components # Angular components
| | ├─ foo.component.ts # Code
Expand All @@ -94,11 +94,11 @@ terminus-pluginname

# Plugins

The app will load all plugins from the source checkout in the dev mode, from the user's plugins directory at all times (click `Open Plugins Directory` under `Settings` > `Plugins`) and from the directory specified by the `TERMINUS_PLUGINS` environment var.
The app will load all plugins from the source checkout in the dev mode, from the user's plugins directory at all times (click `Open Plugins Directory` under `Settings` > `Plugins`) and from the directory specified by the `TABBY_PLUGINS` environment var.

Only modules whose `package.json` file contains a `terminus-plugin` keyword will be loaded.
Only modules whose `package.json` file contains a `tabby-plugin` keyword will be loaded.

If you're currently in your plugin's directory, start Terminus as `TERMINUS_PLUGINS=$(pwd) terminus --debug`
If you're currently in your plugin's directory, start Tabby as `TABBY_PLUGINS=$(pwd) tabby --debug`

A plugin should only provide a default export, which should be a `NgModule` class (or a `NgModuleWithDependencies` where applicable). This module will be injected as a dependency to the app's root module.

Expand All @@ -118,7 +118,7 @@ Plugins provide functionality by exporting singular or multi providers:

```javascript
import { NgModule, Injectable } from '@angular/core'
import { ToolbarButtonProvider, ToolbarButton } from 'terminus-core'
import { ToolbarButtonProvider, ToolbarButton } from 'tabby-core'

@Injectable()
export class MyButtonProvider extends ToolbarButtonProvider {
Expand All @@ -143,6 +143,6 @@ export default class MyModule { }
```


See `terminus-core/src/api.ts`, `terminus-settings/src/api.ts`, `terminus-local/src/api.ts` and `terminus-terminal/src/api.ts` for the available extension points.
See `tabby-core/src/api.ts`, `tabby-settings/src/api.ts`, `tabby-local/src/api.ts` and `tabby-terminal/src/api.ts` for the available extension points.

Publish your plugin on NPM with a `terminus-plugin` keyword to make it appear in the Plugin Manager.
Publish your plugin on NPM with a `tabby-plugin` keyword to make it appear in the Plugin Manager.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

----

**Terminus** is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux
**Tabby** (formerly **Terminus**) is a highly configurable terminal emulator, SSH and serial client for Windows, macOS and Linux

* Integrated SSH client and connection manager
* Integrated serial terminal
Expand All @@ -29,7 +29,7 @@
# Contents

- [Contents](#contents)
- [What Terminus is and isn't](#what-terminus-is-and-isnt)
- [What Tabby is and isn't](#what-tabby-is-and-isnt)
- [Terminal features](#terminal-features)
- [SSH Client](#ssh-client)
- [Serial Terminal](#serial-terminal)
Expand All @@ -39,11 +39,11 @@
- [Contributing](#contributing)

<a name="about"></a>
# What Terminus is and isn't
# What Tabby is and isn't

* **Terminus is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm
* **Tabby is** an alternative to Windows' standard terminal (conhost), PowerShell ISE, PuTTY or iTerm

* **Terminus is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty)
* **Tabby is not** a new shell or a MinGW or Cygwin replacement. Neither is it lightweight - if RAM usage is of importance, consider [Conemu](https://conemu.github.io) or [Alacritty](https://github.com/jwilm/alacritty)

<a name="terminal"></a>
# Terminal features
Expand Down Expand Up @@ -84,12 +84,12 @@
<a name="portable"></a>
# Portable

Terminus will run as a portable app on Windows, if you create a `data` folder in the same location where `Terminus.exe` lives.
Tabby will run as a portable app on Windows, if you create a `data` folder in the same location where `Tabby.exe` lives.

<a name="plugins"></a>
# Plugins

Plugins and themes can be installed directly from the Settings view inside Terminus.
Plugins and themes can be installed directly from the Settings view inside Tabby.

* [clickable-links](https://github.com/Eugeny/terminus-clickable-links) - makes paths and URLs in the terminal clickable
* [title-control](https://github.com/kbjr/terminus-title-control) - allows modifying the title of the terminal tabs by providing a prefix, suffix, and/or strings to be removed
Expand All @@ -102,7 +102,7 @@ Plugins and themes can be installed directly from the Settings view inside Termi
# Themes

* [hype](https://github.com/Eugeny/terminus-theme-hype) - a Hyper inspired theme
* [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Terminus
* [relaxed](https://github.com/Relaxed-Theme/relaxed-terminal-themes#terminus) - the Relaxed theme for Tabby
* [gruvbox](https://github.com/porkloin/terminus-theme-gruvbox)
* [windows10](https://www.npmjs.com/package/terminus-theme-windows10)
* [altair](https://github.com/yxuko/terminus-altair)
Expand Down
2 changes: 1 addition & 1 deletion app/dev-app-update.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
owner: eugeny
repo: terminus
provider: github
updaterCacheDirName: terminus-updater
updaterCacheDirName: tabby-updater
6 changes: 3 additions & 3 deletions app/index.pug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
doctype html
html.terminus
html.tabby
head
meta(charset='UTF-8')
base(href='index.html')
Expand All @@ -15,8 +15,8 @@ html.terminus
app-root
.preload-logo
div
.terminus-logo
h1.terminus-title Terminus
.tabby-logo
h1.tabby-title Tabby
sup α
.progress
.bar(style='width: 0%')
4 changes: 2 additions & 2 deletions app/lib/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export class Application {
this.tray.setContextMenu(contextMenu)
}

this.tray.setToolTip(`Terminus ${app.getVersion()}`)
this.tray.setToolTip(`Tabby ${app.getVersion()}`)
}

disableTray (): void {
Expand Down Expand Up @@ -195,7 +195,7 @@ export class Application {
{
label: 'Application',
submenu: [
{ role: 'about', label: 'About Terminus' },
{ role: 'about', label: 'About Tabby' },
{ type: 'separator' },
{
label: 'Preferences',
Expand Down
2 changes: 1 addition & 1 deletion app/lib/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function parseArgs (argv: string[], cwd: string): any {
}

return require('yargs/yargs')(argv.slice(1))
.usage('terminus [command] [arguments]')
.usage('tabby [command] [arguments]')
.command('open [directory]', 'open a shell in a directory', {
directory: { type: 'string', 'default': cwd },
})
Expand Down
13 changes: 13 additions & 0 deletions app/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,20 @@ import * as path from 'path'
import * as yaml from 'js-yaml'
import { app } from 'electron'

export function migrateConfig (): void {
const configPath = path.join(app.getPath('userData'), 'config.yaml')
const legacyConfigPath = path.join(app.getPath('userData'), '../terminus', 'config.yaml')
if (fs.existsSync(legacyConfigPath) && (
!fs.existsSync(configPath) ||
fs.statSync(configPath).mtime < fs.statSync(legacyConfigPath).mtime
)) {
fs.writeFileSync(configPath, fs.readFileSync(legacyConfigPath))
}
}

export function loadConfig (): any {
migrateConfig()

const configPath = path.join(app.getPath('userData'), 'config.yaml')
if (fs.existsSync(configPath)) {
return yaml.load(fs.readFileSync(configPath, 'utf8'))
Expand Down
4 changes: 2 additions & 2 deletions app/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { parseArgs } from './cli'
import { Application } from './app'
import electronDebug = require('electron-debug')

if (!process.env.TERMINUS_PLUGINS) {
process.env.TERMINUS_PLUGINS = ''
if (!process.env.TABBY_PLUGINS) {
process.env.TABBY_PLUGINS = ''
}

const application = new Application()
Expand Down
3 changes: 0 additions & 3 deletions app/lib/portable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import * as electron from 'electron'

const appPath = path.dirname(electron.app.getPath('exe'))

if (fs.existsSync(path.join(appPath, 'terminus-data'))) {
fs.renameSync(path.join(appPath, 'terminus-data'), path.join(appPath, 'data'))
}
const portableData = path.join(appPath, 'data')
if (fs.existsSync(portableData)) {
console.log('reset user data to ' + portableData)
Expand Down
2 changes: 1 addition & 1 deletion app/lib/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ try {
release = require('@electron/remote').app.getVersion()
}

if (!process.env.TERMINUS_DEV) {
if (!process.env.TABBY_DEV) {
init({
dsn: SENTRY_DSN,
release,
Expand Down
4 changes: 2 additions & 2 deletions app/lib/window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class Window {
const bwOptions: BrowserWindowConstructorOptions = {
width: 800,
height: 600,
title: 'Terminus',
title: 'Tabby',
minWidth: 400,
minHeight: 300,
webPreferences: {
Expand Down Expand Up @@ -118,7 +118,7 @@ export class Window {
})

this.window.on('blur', () => {
if (this.configStore.appearance.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
if (this.configStore.appearance?.dock !== 'off' && this.configStore.appearance?.dockHideOnBlur) {
this.hide()
}
})
Expand Down
Loading

0 comments on commit 43cd331

Please sign in to comment.