move profile creation to ash

Author: obfuscatedgenerated

src/initial_fs_setup.ts

@@ -57,19 +57,19 @@ const setup_motd = async (fs: AbstractFileSystem) => {
     }
 };
 
-const setup_rc_profile = async (fs: AbstractFileSystem) => {
-    // create .ollie_profile file if it doesn't exist
-    const profile_content = `# OllieOS configuration file${NEWLINE}# This file is run when the TTY starts.${NEWLINE}${NEWLINE}cat /etc/motd.txt${NEWLINE}echo "OllieOS v$VERSION ($ENV)"${NEWLINE}`;
-    const absolute_profile = fs.absolute("~/.ollie_profile");
-    if (!(await fs.exists(absolute_profile))) {
-        await fs.write_file(absolute_profile, profile_content);
+const migrate_rc_profile = async (fs: AbstractFileSystem) => {
+    // if .ollie_profile exists, and .ash_profile doesn't, rename it to .ash_profile
+    const absolute_ollie_profile = fs.absolute("~/.ollie_profile");
+    const absolute_ash_profile = fs.absolute("~/.ash_profile");
+    if (await fs.exists(absolute_ollie_profile) && !(await fs.exists(absolute_ash_profile))) {
+        await fs.move_file(absolute_ollie_profile, absolute_ash_profile);
     }
 
-    // create .ollierc file if it doesn't exist
-    const rc_content = `# OllieOS configuration file${NEWLINE}# This file is run when a shell is created.${NEWLINE}${NEWLINE}`;
-    const absolute_rc = fs.absolute("~/.ollierc");
-    if (!(await fs.exists(absolute_rc))) {
-        await fs.write_file(absolute_rc, rc_content);
+    // if .ollierc exists, and .ashrc doesn't, rename it to .ashrc
+    const absolute_ollierc = fs.absolute("~/.ollierc");
+    const absolute_ashrc = fs.absolute("~/.ashrc");
+    if (await fs.exists(absolute_ollierc) && !(await fs.exists(absolute_ashrc))) {
+        await fs.move_file(absolute_ollierc, absolute_ashrc);
     }
 };
 
@@ -422,7 +422,7 @@ const setup_projects = async (fs: AbstractFileSystem, data_rev: string | null) =
 export const initial_fs_setup = async (fs: AbstractFileSystem) => {
     await setup_boot(fs);
     await setup_motd(fs);
-    await setup_rc_profile(fs);
+    await migrate_rc_profile(fs);
     await setup_credits(fs);
 
 

src/programs/core/ash/index.ts

@@ -1,4 +1,5 @@
 import type {Program} from "../../../types";
+import {NEWLINE} from "../../../term_ctl";
 
 import {AshShell} from "./core";
 import {make_read_line_key_handlers, make_read_line_printable_handler} from "./key_handlers";
@@ -24,20 +25,37 @@ export default {
 
         const fs = kernel.get_fs();
 
+        const absolute_profile = fs.absolute("~/.ash_profile");
+        const absolute_rc = fs.absolute("~/.ashrc");
+
+        // create .ash_profile file if it doesn't exist
+        const profile_content = `# ash configuration file${NEWLINE}# This file is run at login.${NEWLINE}${NEWLINE}cat /etc/motd.txt${NEWLINE}echo "OllieOS v$VERSION ($ENV)"${NEWLINE}`;
+        if (!(await fs.exists(absolute_profile))) {
+            await fs.write_file(absolute_profile, profile_content);
+        }
+
+        // create .ashrc file if it doesn't exist
+        const rc_content = `# ash configuration file${NEWLINE}# This file is run when a shell is created.${NEWLINE}${NEWLINE}`;
+        if (!(await fs.exists(absolute_rc))) {
+            await fs.write_file(absolute_rc, rc_content);
+        }
+
         if (args.includes("--login")) {
             // enable screen reader mode if stored in local storage
             if (localStorage.getItem("reader") === "true") {
                 await shell.execute("reader -s on");
             }
 
-            // run .ollie_profile if it exists
-            const absolute_profile = fs.absolute("~/.ollie_profile");
-            await shell.run_script(absolute_profile);
+            // run .ash_profile, checking it exists again just in case (because why not)
+            if (await fs.exists(absolute_profile)) {
+                await shell.run_script(absolute_profile);
+            }
         }
 
-        // run .ollierc if it exists
-        const absolute_rc = fs.absolute("~/.ollierc");
-        await shell.run_script(absolute_rc);
+        // run .ashrc, checking it exists again just in case (could be deleted in profile)
+        if (await fs.exists(absolute_rc)) {
+            await shell.run_script(absolute_rc);
+        }
 
         let running = true;
         let final_code = 0;

src/programs/selfdestruct.ts

@@ -55,6 +55,6 @@ export default {
         term.writeln(`${NEWLINE}Thank you for using OllieOS!${NEWLINE}`);
 
         // TODO: talk to ignition instead of using shutdown command
-        return await kernel.spawn("shutdown", ["r", "-t", "3000"], shell).completion;
+        return await kernel.spawn("shutdown", ["-r", "-t", "3000"], shell).completion;
     }
 } as Program;