Merge branch 'ssh-login-editor' of https://github.com/zealot128-os/gitlab-time-tracker

kriskbx · kriskbx · commit ee35f6428b5b · 2017-10-10T15:59:21.000+02:00
diff --git a/src/include/filesystem.js b/src/include/filesystem.js
@@ -3,6 +3,7 @@ const fs = require('fs');
 const path = require('path');
 const open = require('open');
 const find = require('find-in-files');
+const child_process = require('child_process');
 
 class filesystem {
     static find(pattern, dir) {
@@ -22,7 +23,14 @@ class filesystem {
     }
 
     static open(file) {
+      if ((process.env.SSH_CLIENT || process.env.SSH_TTY) && process.env.EDITOR) {
+        var child = child_process.spawn(process.env.EDITOR, [file], {
+          stdio: 'inherit'
+        });
+        return child;
+      } else {
         return open(file);
+      }
     }
 
     static join(...args) {
@@ -38,4 +46,4 @@ class filesystem {
     }
 }
 
-module.exports = filesystem;
+module.exports = filesystem;

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ const fs = require('fs');`
`3`	`3`	`const path = require('path');`
`4`	`4`	`const open = require('open');`
`5`	`5`	`const find = require('find-in-files');`
	`6`	`+const child_process = require('child_process');`
`6`	`7`
`7`	`8`	`class filesystem {`
`8`	`9`	`static find(pattern, dir) {`
`@@ -22,7 +23,14 @@ class filesystem {`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`static open(file) {`
	`26`	`+ if ((process.env.SSH_CLIENT \|\| process.env.SSH_TTY) && process.env.EDITOR) {`
	`27`	`+ var child = child_process.spawn(process.env.EDITOR, [file], {`
	`28`	`+ stdio: 'inherit'`
	`29`	`+ });`
	`30`	`+ return child;`
	`31`	`+ } else {`
`25`	`32`	`return open(file);`
	`33`	`+ }`
`26`	`34`	`}`
`27`	`35`
`28`	`36`	`static join(...args) {`
`@@ -38,4 +46,4 @@ class filesystem {`
`38`	`46`	`}`
`39`	`47`	`}`
`40`	`48`
`41`		`-module.exports = filesystem;`
	`49`	`+module.exports = filesystem;`