Merge branch 'dev'

baumrock · Dec 9, 2024 · a0f2a7c · a0f2a7c
2 parents f5aef82 + e66f4ef
commit a0f2a7c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/App/Commands/ModuleInstall.php b/App/Commands/ModuleInstall.php
@@ -20,17 +20,29 @@ public function config()
 
   public function handle()
   {
+    // check name
+    $name = $this->option('name');
+    while (!$name) $name = $this->ask("Please enter the module's name");
+
+    wire()->modules->refresh();
+
+    // special case for RockMigrations
+    if ($name == 'RockMigrations') {
+      $rm = wire()->modules->get('RockMigrations');
+      if (!$rm) {
+        $this->error("RockMigrations module not found");
+        return self::FAILURE;
+      }
+      return self::SUCCESS;
+    }
+
     // load RockMigrations
     $rm = wire()->modules->get('RockMigrations');
     if (!$rm) {
       $this->error("RockMigrations module not found");
       return self::FAILURE;
     }
 
-    // check name
-    $name = $this->option('name');
-    while (!$name) $name = $this->ask("Please enter the module's name");
-
     // install module
     $rm->installModule($name);
 

diff --git a/Application.php b/Application.php
@@ -22,7 +22,7 @@ class Application extends ConsoleApplication
    * Path to root folder of the project having a trailing slash
    * @var string $root
    */
-  private $root;
+  public $root;
 
   public function __construct($name = "RockShell", $version = null)
   {