fix merge

source/cell.c

@@ -27,6 +27,7 @@ int run_c_test_suite(JSContext *ctx);
 static int run_test_suite(size_t heap_size);
 
 cell_rt *root_cell = NULL;
+static char *shop_path = NULL;
 static char *core_path = NULL;
 static JSRuntime *g_runtime = NULL;
 
@@ -39,31 +40,52 @@ static const char* get_home_dir(void) {
   return home;
 }
 
-// Find and verify the cell shop at ~/.cell
-int find_cell_shop(void)
+// Find and verify the cell shop
+// Precedence: override (--shop flag) > CELL_SHOP env var > ~/.cell
+int find_cell_shop(const char *override_path)
 {
-  const char *home = get_home_dir();
-  if (!home) {
-    printf("ERROR: Could not determine home directory. Set HOME environment variable.\n");
-    return 0;
+  if (override_path) {
+    shop_path = strdup(override_path);
+  } else {
+    const char *env = getenv("CELL_SHOP");
+    if (env) {
+      shop_path = strdup(env);
+    } else {
+      const char *home = get_home_dir();
+      if (!home) {
+        printf("ERROR: Could not determine home directory. Set HOME environment variable.\n");
+        return 0;
+      }
+      size_t path_len = strlen(home) + strlen("/" CELL_SHOP_DIR) + 1;
+      shop_path = malloc(path_len);
+      if (!shop_path) {
+        printf("ERROR: Could not allocate memory for shop path\n");
+        return 0;
+      }
+      snprintf(shop_path, path_len, "%s/" CELL_SHOP_DIR, home);
+    }
   }
 
-  // Build path to ~/.cell/core
-  size_t path_len = strlen(home) + strlen("/" CELL_SHOP_DIR "/" CELL_CORE_DIR) + 1;
-  core_path = malloc(path_len);
+  // Derive core_path from shop_path
+  size_t core_len = strlen(shop_path) + strlen("/" CELL_CORE_DIR) + 1;
+  core_path = malloc(core_len);
   if (!core_path) {
     printf("ERROR: Could not allocate memory for core path\n");
+    free(shop_path);
+    shop_path = NULL;
     return 0;
   }
-  snprintf(core_path, path_len, "%s/" CELL_SHOP_DIR "/" CELL_CORE_DIR, home);
+  snprintf(core_path, core_len, "%s/" CELL_CORE_DIR, shop_path);
 
   // Check if the core directory exists
   struct stat st;
   if (stat(core_path, &st) != 0 || !S_ISDIR(st.st_mode)) {
-    printf("ERROR: Cell shop not found at %s/" CELL_SHOP_DIR "\n", home);
+    printf("ERROR: Cell shop not found at %s\n", shop_path);
     printf("Run 'cell install' to set up the cell environment.\n");
     free(core_path);
+    free(shop_path);
     core_path = NULL;
+    shop_path = NULL;
     return 0;
   }
 
@@ -188,8 +210,8 @@ void script_startup(cell_rt *prt)
   JS_SetPropertyStr(js, hidden_env, "args", JS_NULL);
   JS_SetPropertyStr(js, hidden_env, "use_mcode", JS_NewBool(js, 0));
 
-  if (core_path) {
-    JS_SetPropertyStr(js, hidden_env, "core_path", JS_NewString(js, core_path));
+  if (shop_path) {
+    JS_SetPropertyStr(js, hidden_env, "shop_path", JS_NewString(js, shop_path));
   }
 
   // Stone the environment
@@ -260,6 +282,7 @@ static void print_usage(const char *prog)
   printf("Usage: %s [options] <script> [args...]\n\n", prog);
   printf("Run a cell script (.ce actor or .cm module).\n\n");
   printf("Options:\n");
+  printf("  --shop <path>              Set shop path (overrides CELL_SHOP env var)\n");
   printf("  --mcode <script> [args]    Run through mcode compilation pipeline\n");
   printf("  --test [heap_size]         Run C test suite\n");
   printf("  -h, --help                 Show this help message\n");
@@ -291,12 +314,26 @@ int cell_init(int argc, char **argv)
   /* Default: run script through bootstrap pipeline */
   int use_mcode = 0;
   int arg_start = 1;
-  if (argc >= 3 && strcmp(argv[1], "--mcode") == 0) {
-    use_mcode = 1;
-    arg_start = 2;
+  const char *shop_override = NULL;
+
+  // Parse flags (order-independent)
+  while (arg_start < argc && argv[arg_start][0] == '-') {
+    if (strcmp(argv[arg_start], "--mcode") == 0) {
+      use_mcode = 1;
+      arg_start++;
+    } else if (strcmp(argv[arg_start], "--shop") == 0) {
+      if (arg_start + 1 >= argc) {
+        printf("ERROR: --shop requires a path argument\n");
+        return 1;
+      }
+      shop_override = argv[arg_start + 1];
+      arg_start += 2;
+    } else {
+      break;
+    }
   }
 
-  if (!find_cell_shop()) return 1;
+  if (!find_cell_shop(shop_override)) return 1;
 
   actor_initialize();
 
@@ -357,7 +394,7 @@ int cell_init(int argc, char **argv)
 
   JSValue hidden_env = JS_NewObject(ctx);
   JS_SetPropertyStr(ctx, hidden_env, "os", js_os_use(ctx));
-  JS_SetPropertyStr(ctx, hidden_env, "core_path", JS_NewString(ctx, core_path));
+  JS_SetPropertyStr(ctx, hidden_env, "shop_path", JS_NewString(ctx, shop_path));
   JS_SetPropertyStr(ctx, hidden_env, "use_mcode", JS_NewBool(ctx, use_mcode));
   JS_SetPropertyStr(ctx, hidden_env, "actorsym", JS_DupValue(ctx, cli_rt->actor_sym_ref.val));
   JS_SetPropertyStr(ctx, hidden_env, "json", js_json_use(ctx));