Skip to content

Commit

Permalink
Revert "app: +shell"
Browse files Browse the repository at this point in the history
This reverts commit 53d6b4d.

# Conflicts:
#	App.js
  • Loading branch information
panlina committed Jul 4, 2022
1 parent f1de2dc commit 76babf4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion AdminApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ function AdminApp(site, { cors, auth }) {
arguments: app.arguments,
cwd: app.cwd,
env: app.env,
shell: app.shell,
port: app.port,
running: app.running
};
Expand Down
4 changes: 1 addition & 3 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class App {
this.arguments = argument.arguments;
this.cwd = argument.cwd;
this.env = argument.env;
this.shell = argument.shell;
this.port = argument.port;
this.process;
this._port;
Expand Down Expand Up @@ -76,8 +75,7 @@ class App {
var $this = this;
this.process = child_process.spawn(interpolate(this.module), this.arguments.map(interpolate), {
...this.cwd ? { cwd: path.resolve(this.site.config.dir, this.cwd) } : {},
env: { ...process.env, ...mapValues(this.env, interpolate) },
shell: this.shell
env: { ...process.env, ...mapValues(this.env, interpolate) }
});
this.process.on('spawn', function () {
$this._port = $this.port;
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class Site {
});
var adminServer = (config.adminSsl ? https : http).createServer(config.adminSsl ? serverOptions : undefined, adminApp);
adminServer.listen(config.adminPort);
var app = Storage(path.join(config.dir, 'app.json'), { constructor: this.App, destructor: app => ({ type: app.type, module: app.module, arguments: app.arguments, cwd: app.cwd, env: app.env, shell: app.shell, port: app.port }) });
var app = Storage(path.join(config.dir, 'app.json'), { constructor: this.App, destructor: app => ({ type: app.type, module: app.module, arguments: app.arguments, cwd: app.cwd, env: app.env, port: app.port }) });
var module = Storage(path.join(config.dir, 'module.json'));
for (let name in app)
app[name].start(e => {
Expand Down

0 comments on commit 76babf4

Please sign in to comment.