From edf225e8883be43684469785771587e565f97d91 Mon Sep 17 00:00:00 2001
From: Filip Tibell <filip.tibell@gmail.com>
Date: Tue, 21 Feb 2023 16:45:31 +0100
Subject: [PATCH] Add os and arch constants to process global

---
 docs/luneTypes.d.luau               | 25 +++++++++++++++++++++++++
 packages/lib/src/globals/process.rs | 13 +++++++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/docs/luneTypes.d.luau b/docs/luneTypes.d.luau
index ef7196b..d04bec4 100644
--- a/docs/luneTypes.d.luau
+++ b/docs/luneTypes.d.luau
@@ -264,6 +264,31 @@ export type ProcessSpawnResult = {
 	Current process & child processes
 ]=]
 declare process: {
+	--[=[
+		@within process
+		@read_only
+		
+		The current operating system being used.
+		
+		Possible values:
+
+		* `"linux"`
+		* `"macos"`
+		* `"windows"`
+	]=]
+	os: "linux" | "macos" | "windows",
+	--[=[
+		@within process
+		@read_only
+		
+		The architecture of the processor currently being used.
+		
+		Possible values:
+
+		* `"x86_64"`
+		* `"aarch64"`
+	]=]
+	arch: "x86_64" | "aarch64",
 	--[=[
 		@within process
 		@read_only
diff --git a/packages/lib/src/globals/process.rs b/packages/lib/src/globals/process.rs
index 0e9c16b..4a1163e 100644
--- a/packages/lib/src/globals/process.rs
+++ b/packages/lib/src/globals/process.rs
@@ -1,7 +1,7 @@
 use std::{
     collections::HashMap,
-    env,
-    path::PathBuf,
+    env::{self, consts},
+    path::{self, PathBuf},
     process::{ExitCode, Stdio},
 };
 
@@ -23,12 +23,15 @@ pub fn create(lua: &'static Lua, args_vec: Vec<String>) -> LuaResult<LuaTable> {
     let cwd_str = {
         let cwd = env::current_dir()?.canonicalize()?;
         let cwd_str = cwd.to_string_lossy().to_string();
-        if !cwd_str.ends_with('/') {
-            format!("{cwd_str}/")
+        if !cwd_str.ends_with(path::MAIN_SEPARATOR) {
+            format!("{cwd_str}{}", path::MAIN_SEPARATOR)
         } else {
             cwd_str
         }
     };
+    // Create constants for OS & processor architecture
+    let os = lua.create_string(&consts::OS.to_lowercase())?;
+    let arch = lua.create_string(&consts::ARCH.to_lowercase())?;
     // Create readonly args array
     let args_tab = TableBuilder::new(lua)?
         .with_sequential_values(args_vec)?
@@ -67,6 +70,8 @@ pub fn create(lua: &'static Lua, args_vec: Vec<String>) -> LuaResult<LuaTable> {
         .into_function()?;
     // Create the full process table
     TableBuilder::new(lua)?
+        .with_value("os", os)?
+        .with_value("arch", arch)?
         .with_value("args", args_tab)?
         .with_value("cwd", cwd_str)?
         .with_value("env", env_tab)?