GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-16 17:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow the general Terminus style

Browse Source
This commit is contained in:
Domain 2018-08-29 17:02:02 +08:00
parent ce2c72393b
commit 98a7801803
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
terminus-ssh/src/api.ts
View File

@ -30,27 +30,22 @@ export class SSHSession extends BaseSession {
let dataString = data.toString() let dataString = data.toString()
this.emitOutput(dataString) this.emitOutput(dataString)
if (this.scripts && this.scripts.length > 0) if (this.scripts && this.scripts.length > 0) {
{
let found = false let found = false
for (let i = 0; i < this.scripts.length; i++) for (let i = 0; i < this.scripts.length; i++) {
{ if (dataString.indexOf(this.scripts[i].expect) >= 0) {
if (dataString.indexOf(this.scripts[i].expect) >= 0)
{
console.log("Executing: " + this.scripts[i].send) console.log("Executing: " + this.scripts[i].send)
this.shell.write(this.scripts[i].send + "\n") this.shell.write(this.scripts[i].send + "\n")
this.scripts.splice(i, 1) this.scripts.splice(i, 1)
i-- i--
found = true found = true
} }
else else {
{
break; break;
} }
} }
if (found) if (found) {
{
this.executeScripts() this.executeScripts()
} }
} }
@ -66,19 +61,15 @@ export class SSHSession extends BaseSession {
} }
executeScripts () { executeScripts () {
if (this.scripts && this.scripts.length > 0) if (this.scripts && this.scripts.length > 0) {
{ for (let i = 0; i < this.scripts.length; i++) {
for (let i = 0; i < this.scripts.length; i++) if (!this.scripts[i].expect) {
{
if (!this.scripts[i].expect)
{
console.log("Executing: " + this.scripts[i].send) console.log("Executing: " + this.scripts[i].send)
this.shell.write(this.scripts[i].send + "\n") this.shell.write(this.scripts[i].send + "\n")
this.scripts.splice(i, 1) this.scripts.splice(i, 1)
i-- i--
} }
else else {
{
break; break;
} }
} }

6
terminus-ssh/src/components/editConnectionModal.component.ts
View File

@ -40,8 +40,7 @@ export class EditConnectionModalComponent {
up (script: LoginScript) { up (script: LoginScript) {
let index = this.connection.scripts.indexOf(script) let index = this.connection.scripts.indexOf(script)
if (index > 0) if (index > 0) {
{
this.connection.scripts.splice(index, 1); this.connection.scripts.splice(index, 1);
this.connection.scripts.splice(index - 1, 0, script); this.connection.scripts.splice(index - 1, 0, script);
} }
@ -49,8 +48,7 @@ export class EditConnectionModalComponent {
down (script: LoginScript) { down (script: LoginScript) {
let index = this.connection.scripts.indexOf(script) let index = this.connection.scripts.indexOf(script)
if (index >= 0 && index < this.connection.scripts.length - 1) if (index >= 0 && index < this.connection.scripts.length - 1) {
{
this.connection.scripts.splice(index, 1); this.connection.scripts.splice(index, 1);
this.connection.scripts.splice(index + 1, 0, script); this.connection.scripts.splice(index + 1, 0, script);
} }