smarter version info handling

Author: obfuscatedgenerated

src/abstract_shell.ts

@@ -32,19 +32,3 @@ export abstract class AbstractShell {
     // edit_doc_title should default to true in implementations
     abstract execute(line: string, edit_doc_title?: boolean, program_final_completion_callback?: (exit_code?: number) => void): Promise<boolean>;
 }
-
-let version = "unknown";
-let env = "unknown";
-
-export const set_special_vars = (new_version: string, new_env: string) => {
-    version = new_version;
-    env = new_env;
-};
-
-export const apply_special_vars = (shell: AbstractShell) => {
-    shell.memory.set_variable("VERSION", version);
-    shell.memory.set_variable("ENV", env);
-}
-
-// bit of a hack to get version and env into shells without assumptions (about shell choice or about if its running in the browser), so long as the shell calls it at startup
-// it works at least

src/index.ts

@@ -6,7 +6,7 @@ import { WebLinksAddon } from "@xterm/addon-web-links";
 import { ImageAddon } from "@xterm/addon-image";
 
 import "./load_global_externals";
-import {ProgramRegistry, recurse_mount_and_register_with_output} from "./prog_registry";
+import {ProgramRegistry} from "./prog_registry";
 import * as programs from "./programs/@ALL";
 
 import { SoundRegistry } from "./sfx_registry";
@@ -16,10 +16,8 @@ import { LocalStorageFS } from "./fs_impl/localstorage";
 import { OPFSFileSystem } from "./fs_impl/opfs";
 import { initial_fs_setup } from "./initial_fs_setup";
 
-import Swal from "sweetalert2";
 import {DOMWindowManager} from "./window_impl/dom";
 import {Kernel} from "./kernel";
-import {set_special_vars} from "./abstract_shell";
 
 
 const boot_screen = document.getElementById("boot_screen");
@@ -216,9 +214,7 @@ async function main() {
 
     // create the kernel
     const kernel = new Kernel(term, fs, prog_reg, sfx_reg, wm);
-
-    // set version and env info in shell special vars
-    set_special_vars(document.body.dataset.version, "web");
+    kernel.set_env_info(document.body.dataset.version, "web");
 
     loaded(term);
 

src/kernel.ts

@@ -27,6 +27,11 @@ export class Kernel {
 
     _panicked = false;
 
+    _env_info = {
+        version: "unknown",
+        env: "unknown"
+    }
+
     get panicked(): boolean {
         return this._panicked;
     }
@@ -59,6 +64,15 @@ export class Kernel {
         return this._process_manager.ipc_manager;
     }
 
+    get_env_info(): {version: string, env: string} {
+        return this._env_info;
+    }
+
+    set_env_info(version: string, env: string) {
+        this._env_info.version = version;
+        this._env_info.env = env;
+    }
+
     spawn = (command: string, args: string[] = [], shell?: AbstractShell, original_line_parse?: LineParseResultCommand): SpawnResult => {
         // search for the command in the registry
         const program = this._prog_registry.getProgram(command);

src/programs/core/ash/index.ts

@@ -2,7 +2,6 @@ import type {Program} from "../../../types";
 
 import {AshShell} from "./core";
 import {make_read_line_key_handlers, make_read_line_printable_handler} from "./key_handlers";
-import {apply_special_vars} from "../../../abstract_shell";
 
 export default {
     name: "ash",
@@ -17,7 +16,10 @@ export default {
         const {kernel, term, process, args} = data;
 
         const shell = new AshShell(term, kernel);
-        apply_special_vars(shell);
+
+        const env_info = kernel.get_env_info();
+        shell.memory.set_variable("VERSION", env_info.version);
+        shell.memory.set_variable("ENV", env_info.env);
 
         const fs = kernel.get_fs();
 

src/programs/mefetch.ts

@@ -110,13 +110,13 @@ export default {
     completion: async () => [],
     main: async (data) => {
         // extract from data to make code less verbose
-        const { kernel, term, shell, args } = data;
+        const { kernel, term, args } = data;
 
         // extract from ANSI to make code less verbose
         const { STYLE, FG } = ANSI;
 
         // get version string
-        const version_str = shell ? shell.memory.get_variable("VERSION") || "unknown" : "unknown";
+        const version_str = kernel.get_env_info().version;
 
         // restrict to first 3 quarters of screen
         const max_columns = Math.floor(term.cols * 0.75);