From f9326399c15596c876e82426ed25853deee3c09f Mon Sep 17 00:00:00 2001
From: Lisa Milne <lisamilne618@gmail.com>
Date: Tue, 14 Nov 2023 14:53:45 +1000
Subject: [PATCH] clean up reboot code a bit, add help to reboot command

---
 clite/commands.js | 25 +++++++++++++++++++++++++
 clite/core.js     | 35 +++++++++++++++++++++++------------
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/clite/commands.js b/clite/commands.js
index 1587e26..e497c11 100644
--- a/clite/commands.js
+++ b/clite/commands.js
@@ -492,6 +492,31 @@ Options:
 
 clite.commands.load('reboot',function(args,env,io) {
 	var stdio = io.include('stdio');
+	function help() {
+		io.write(`
+reboot - reboot the system, forcing reload of all code
+
+Options:
+-?	Print this help information
+		`);
+	}
+
+	for (var i=1; i<args.length; i++) {
+		if (args[i][0] == '-') {
+			for (var j=1; j<args[i].length; j++) {
+				switch (args[i][j]) {
+				case '?':
+					help();
+					return 0;
+					break;
+				default:
+					io.error('unknown argument: -'+args[i][j]);
+				}
+			}
+		}else{
+			io.error('unknown argument: '+args[i]);
+		}
+	}
 
 	var fd = stdio.open('/dev/initctl',false);
 	if (!fd)
diff --git a/clite/core.js b/clite/core.js
index 699eabb..ab1af1a 100644
--- a/clite/core.js
+++ b/clite/core.js
@@ -1,5 +1,6 @@
 var clite = {
 	state:{
+		version:'0.1-12',
 		isinit:false,
 		terminal:null,
 		input:{
@@ -94,6 +95,23 @@ var clite = {
 			document.body.appendChild(link);
 			link.click();
 			document.body.removeChild(link);
+		},
+		reboot:function() {
+			clite.log.write('The system is rebooting');
+			setTimeout(function() {
+				clite.term.preventInput();
+				clite.log.write('Bringing down the system');
+				var l = clite.core.load.script;
+				var s = Array.from(document.getElementsByTagName('src'));
+				s.forEach(function(el,i) {
+					el.parentNode.removeChild(el);
+				});
+				clite.term.preventInput();
+				clite.log.write('Resetting system core');
+				delete clite;
+				clite = null;
+				l('clite/core.js',function() {setTimeout('clite.init();',500)});
+			},10);
 		}
 	},
 	init:function() {
@@ -191,21 +209,13 @@ var clite = {
 							n.data.content.data = 1;
 							break;
 						case 3: // really just a status change, doesn't "do" anything
+							clite.init = 3;
 							n.data.content.data = 3;
 							break;
 						case 6:
+							clite.init = 6;
 							n.data.content.data = 6;
-							setTimeout(function() {
-								var l = clite.core.load.script;
-								var s = Array.from(document.getElementsByTagName('src'));
-								s.forEach(function(el) {
-									el.parentNode.removeChild(el);
-								});
-								clite.term.preventInput();
-								delete clite;
-								clite = null;
-								l('clite/core.js',function() {setTimeout('clite.init();',10)});
-							},10);
+							clite.core.reboot();
 							break;
 						default:;
 						}
@@ -218,6 +228,7 @@ var clite = {
 			}
 
 			function init1() {
+				clite.log.write('CLIte Version '+clite.state.version);
 				// setup vfs
 				clite.log.write('Setting up VFS');
 				clite.vfs.init();
@@ -1007,7 +1018,7 @@ clite.vfs = {
 clite.log = {
 	init:function(vfs) {
 		clite.log.write = function(txt) {
-			if (!clite.user.hasLogin()) {
+			if (!clite.user.hasLogin() || (typeof clite.init == 'number' && clite.init != 3)) {
 				try {
 					clite.term.writeLine(txt);
 				} catch(e) {}