Merge pull request #78 from Milk-Cool/master

Bugfix & Ctrl+Alt+Del

Author: PROPHESSOR

js/core/tty/ctrlaltdel.js

@@ -0,0 +1,4 @@
+module.exports = () => {
+ debug("Ctrl+Alt+Del pressed, rebooting");
+ $$.machine.reboot();
+}

js/core/tty/terminal.js

@@ -27,6 +27,15 @@ exports.clear = printer.clear;
 
 let isReading = false;
 
+function listenCtrlAltDel (keyinfo) {
+ if (keyinfo.type === "kpdel"
+ && keyinfo.ctrl
+ && keyinfo.alt) {
+ require("./ctrlaltdel.js")();
+ }
+}
+keyboard.onKeydown.add(listenCtrlAltDel);
+
 exports.read = (cb) => {
  if (isReading) {
  throw new Error('nested terminal read is not allowed');

js/service/shell/commands.js

@@ -79,11 +79,11 @@ const cmds = {
  'description': 'Show this message or show usage of the command =)',
  'usage': 'help <command> |OR| help |OR| help -p[=n] |OR| help --page[=n]',
  run (_args, f, res) {
- let args = _args.trim().split(/\s+/);
+ let args = _args.trim().split(/(\s+)/).filter(i => i.trim().length > 0);
 
- if (!args || args[0].startsWith("-p") || args[0].startsWith("--page")) {
-  let tmp_page = args[0].slice(3 + 4 * Number(args[0].startsWith("--page"))) - 1 || 0;
-  if(tmp_page == -1) tmp_page = 0;
+ if (args.length === 0 || args[0].startsWith("-p") || args[0].startsWith("--page")) {
+ if (!args.length) args = ["-p=1"];
+ const tmp_page = args[0].slice(3 + 4 * Number(args[0].startsWith("--page"))) - 1;
  const height = HEIGHT - 4;
  const commandList = Array.from(processor.getCommands()).sort();
  if(tmp_page < 0 || tmp_page + 1 > Math.ceil(commandList.length / height)){