diff --git a/.gitmodules b/.gitmodules
index b4a5a6c1..de5dc32b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "zmodemjs"]
- path = demo/zmodemjs
+ path = src/addons/zmodem/zmodemjs
url = https://github.com/FGasper/zmodemjs.git
diff --git a/demo/app.js b/demo/app.js
index 87c4a6ef..0b68f409 100644
--- a/demo/app.js
+++ b/demo/app.js
@@ -29,10 +29,17 @@ app.get('/js/*.js', function(req, res){
res.sendFile(__dirname + req.url);
});
+var shell_args = {
+ bash: ['--login'],
+ 'cmd.exe': [],
+};
+
+var shell_name = process.platform === 'win32' ? 'cmd.exe' : 'bash';
+
app.post('/terminals', function (req, res) {
var cols = parseInt(req.query.cols),
rows = parseInt(req.query.rows),
- term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], {
+ term = pty.spawn(shell_name, shell_args[shell_name], {
encoding: null,
name: 'xterm-color',
cols: cols || 80,
diff --git a/demo/index.html b/demo/index.html
index 109a7bd3..ce3c23de 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -16,7 +16,7 @@
-
+
xterm.js: xterm, in the browser
diff --git a/demo/main.js b/demo/main.js
index a0f64b9d..637b45dc 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -294,12 +294,14 @@ function handleWSMessage(evt) {
//var text_encoder = new TextEncoder();
function runRealTerminal() {
- //term.attach(socket);
+ term.attach(socket, false);
+/*
term.on("data", (d) => {
//socket.send( text_encoder.encode(d) );
socket.send(d);
});
+*/
term._initialized = true;
}
diff --git a/demo/zmodemjs b/demo/zmodemjs
deleted file mode 160000
index cea252d1..00000000
--- a/demo/zmodemjs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cea252d19bc64333254de8fb844b4b634df5b96e
diff --git a/src/addons/zmodem/zmodemjs b/src/addons/zmodem/zmodemjs
new file mode 160000
index 00000000..eaba9af9
--- /dev/null
+++ b/src/addons/zmodem/zmodemjs
@@ -0,0 +1 @@
+Subproject commit eaba9af9705cf3b0689ec770caeca054886d97fe