fix help zombies

Author: obfuscatedgenerated

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ollieos",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "",
   "main": "server.js",
   "scripts": {

package.json

@@ -46,8 +46,12 @@ export default {
                 shell.memory.clear_history();
                 term.writeln(`${STYLE.bold + FG.gray}Scrollback cleared.${STYLE.reset_all}`);
                 break;
-            case "-h":
-                return await kernel.spawn("help", ["clear"], shell).completion;
+            case "-h": {
+                const spawn_result = kernel.spawn("help", ["clear"], shell);
+                const exit_code = await spawn_result.completion;
+                spawn_result.process.kill(exit_code);
+                return exit_code;
+            }
             default:
                 term.writeln(`${FG.red}Invalid argument: ${args[0]}${STYLE.reset_all}`);
                 return 1;

src/programs/clear.ts

@@ -50,8 +50,9 @@ export default {
 
         if (args[0] === "-h") {
             const spawn_result = kernel.spawn("help", ["hex"], shell);
-            spawn_result.process.kill(await spawn_result.completion);
-            return 0;
+            const exit_code = await spawn_result.completion;
+            spawn_result.process.kill(exit_code);
+            return exit_code;
         }
 
         // get filepath

src/programs/hex.ts

@@ -34,8 +34,12 @@ export default {
                 case "-a":
                     show_hidden = true;
                     break;
-                case "-h":
-                    return await kernel.spawn("help", ["ls"], shell).completion;
+                case "-h": {
+                    const spawn_result = kernel.spawn("help", ["ls"], shell);
+                    const exit_code = await spawn_result.completion;
+                    spawn_result.process.kill(exit_code);
+                    return exit_code;
+                }
                 default:
                     path = fs.absolute(arg);
             }

src/programs/ls.ts

@@ -609,7 +609,10 @@ export default {
         }
 
         if (args.includes("-h")) {
-            return await kernel.spawn("help", ["pkg"], shell).completion;
+            const spawn_result = kernel.spawn("help", ["pkg"], shell);
+            const exit_code = await spawn_result.completion;
+            spawn_result.process.kill(exit_code);
+            return exit_code;
         }
 
         // create /var/lib/pkg if it doesn't exist so subcommands don't have to check

src/programs/pkg/index.ts

@@ -42,8 +42,12 @@ export default {
         const sfx_reg = kernel.get_sound_registry();
 
         switch (args[0]) {
-            case "-h":
-                return await kernel.spawn("help", ["clear"], shell).completion;
+            case "-h": {
+                const spawn_result = kernel.spawn("help", ["reader"], shell);
+                const exit_code = await spawn_result.completion;
+                spawn_result.process.kill(exit_code);
+                return exit_code;
+            }
             case "-q":
                 // query screen reader mode
                 term.writeln(`Screen reader mode is currently ${term.get_custom_flag("reader_support") ? "on" : "off"}.`);

src/programs/reader.ts

@@ -102,7 +102,10 @@ export default {
         const { PREFABS, STYLE, FG } = ANSI;
 
         if (args.includes("-h")) {
-            return await kernel.spawn("help", ["rss"], shell).completion;
+            const spawn_result = kernel.spawn("help", ["rss"], shell);
+            const exit_code = await spawn_result.completion;
+            spawn_result.process.kill(exit_code);
+            return exit_code;
         }
 
         let max_items: number | undefined = undefined;

src/programs/rss.ts

@@ -26,8 +26,12 @@ export default {
 
         for (const arg of args) {
             switch (arg) {
-                case "-h":
-                    return await kernel.spawn("help", ["shutdown"], shell).completion;
+                case "-h": {
+                    const spawn_result = kernel.spawn("help", ["shutdown"], shell);
+                    const exit_code = await spawn_result.completion;
+                    spawn_result.process.kill(exit_code);
+                    return exit_code;
+                }
                 case "-r":
                     restart = true;
                     break;

src/programs/shutdown.ts

@@ -47,7 +47,10 @@ export default {
         }
 
         if (args.includes("-h")) {
-            return await kernel.spawn("help", ["spark"], shell).completion;
+            const spawn_result = kernel.spawn("help", ["spark"], shell);
+            const exit_code = await spawn_result.completion;
+            spawn_result.process.kill(exit_code);
+            return exit_code;
         }
 
         switch (args[0]) {