Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
7d1fe50e
Commit
7d1fe50e
authored
Dec 07, 2020
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
standard
parent
a789fa7f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
22 deletions
+22
-22
remixd-handle.js
apps/remix-ide/src/app/files/remixd-handle.js
+1
-1
terminal.js
apps/remix-ide/src/app/panels/terminal.js
+3
-3
gitClient.ts
libs/remixd/src/services/gitClient.ts
+18
-18
No files found.
apps/remix-ide/src/app/files/remixd-handle.js
View file @
7d1fe50e
...
@@ -84,7 +84,7 @@ export class RemixdHandle extends WebsocketPlugin {
...
@@ -84,7 +84,7 @@ export class RemixdHandle extends WebsocketPlugin {
}
}
},
3000
)
},
3000
)
this
.
locahostProvider
.
init
(
_
=>
this
.
fileSystemExplorer
.
ensureRoot
())
this
.
locahostProvider
.
init
(
_
=>
this
.
fileSystemExplorer
.
ensureRoot
())
this
.
call
(
'manager'
,
'activatePlugin'
,
'git'
)
this
.
call
(
'manager'
,
'activatePlugin'
,
'git'
)
}
}
}
}
if
(
this
.
locahostProvider
.
isConnected
())
{
if
(
this
.
locahostProvider
.
isConnected
())
{
...
...
apps/remix-ide/src/app/panels/terminal.js
View file @
7d1fe50e
...
@@ -103,7 +103,7 @@ class Terminal extends Plugin {
...
@@ -103,7 +103,7 @@ class Terminal extends Plugin {
})
})
this
.
on
(
'scriptRunner'
,
'error'
,
(
msg
)
=>
{
this
.
on
(
'scriptRunner'
,
'error'
,
(
msg
)
=>
{
this
.
commands
.
error
.
apply
(
this
.
commands
,
msg
.
data
)
this
.
commands
.
error
.
apply
(
this
.
commands
,
msg
.
data
)
})
})
}
}
onDeactivation
()
{
onDeactivation
()
{
...
@@ -749,9 +749,9 @@ class Terminal extends Plugin {
...
@@ -749,9 +749,9 @@ class Terminal extends Plugin {
try
{
try
{
let
result
let
result
if
(
script
.
trim
().
startsWith
(
'git'
))
{
if
(
script
.
trim
().
startsWith
(
'git'
))
{
result
=
await
this
.
call
(
'git'
,
'execute'
,
script
)
result
=
await
this
.
call
(
'git'
,
'execute'
,
script
)
}
else
{
}
else
{
result
=
await
this
.
call
(
'scriptRunner'
,
'execute'
,
script
)
result
=
await
this
.
call
(
'scriptRunner'
,
'execute'
,
script
)
}
}
if
(
result
)
self
.
commands
.
html
(
yo
`<pre>
${
result
}
</pre>`
)
if
(
result
)
self
.
commands
.
html
(
yo
`<pre>
${
result
}
</pre>`
)
done
()
done
()
...
...
libs/remixd/src/services/gitClient.ts
View file @
7d1fe50e
...
@@ -17,24 +17,24 @@ export class GitClient extends PluginClient {
...
@@ -17,24 +17,24 @@ export class GitClient extends PluginClient {
this
.
readOnly
=
readOnly
this
.
readOnly
=
readOnly
}
}
execute
(
cmd
:
string
)
{
execute
(
cmd
:
string
)
{
assertCommand
(
cmd
)
assertCommand
(
cmd
)
const
options
=
{
cwd
:
this
.
currentSharedFolder
,
shell
:
true
}
const
options
=
{
cwd
:
this
.
currentSharedFolder
,
shell
:
true
}
const
child
=
spawn
(
cmd
,
options
)
const
child
=
spawn
(
cmd
,
options
)
let
result
=
''
let
result
=
''
let
error
=
''
let
error
=
''
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
child
.
stdout
.
on
(
'data'
,
(
data
)
=>
{
child
.
stdout
.
on
(
'data'
,
(
data
)
=>
{
result
+=
data
.
toString
()
result
+=
data
.
toString
()
})
})
child
.
stderr
.
on
(
'data'
,
(
err
)
=>
{
child
.
stderr
.
on
(
'data'
,
(
err
)
=>
{
error
+=
err
.
toString
()
error
+=
err
.
toString
()
})
})
child
.
on
(
'close'
,
()
=>
{
child
.
on
(
'close'
,
()
=>
{
if
(
error
)
reject
(
error
)
if
(
error
)
reject
(
error
)
else
resolve
(
result
)
else
resolve
(
result
)
})
})
})
})
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment