fix: wrong paths when using default folder structure

baumrock · Jul 2, 2024 · 0f1c509 · 0f1c509
1 parent c89d568
commit 0f1c509
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/App/Commands/PwSetup.php b/App/Commands/PwSetup.php
@@ -29,29 +29,20 @@ public function handle()
     }
 
     // add config-local.php
-    $split = !is_file($this->wire()->config->paths->site . "config-local.php");
-    if ($split and $this->confirm("Split config into config.php and config-local.php?", true)) {
+    $localConfig = $this->wire()->config->paths->site . "config-local.php";
+    if (!is_file($localConfig) and $this->confirm("Split config into config.php and config-local.php?", true)) {
       $this->warn('Adding config-local.php ...');
-      $dst = $this->app->rootPath() . "config-local.php";
-      $write = true;
-      if (is_file($dst)) {
-        if (!$this->confirm("$dst exists - overwrite it?", false)) {
-          $this->write("Aborting...");
-          $write = false;
-        }
-      }
-      if ($write) {
-        $src = $this->stub('config-local.php');
-        $config = $this->wire()->config;
-        $this->stubPopulate($src, $dst, [
-          'host' => $config->httpHost,
-          'userAuthSalt' => $config->userAuthSalt,
-          'tableSalt' => $config->tableSalt,
-        ]);
-        $gitignore = $this->app->rootPath() . ".gitignore";
-        if (!is_file($gitignore)) {
-          file_put_contents($gitignore, "config-local.php\n");
-        }
+
+      $src = $this->stub('config-local.php');
+      $config = $this->wire()->config;
+      $this->stubPopulate($src, $localConfig, [
+        'host' => $config->httpHost,
+        'userAuthSalt' => $config->userAuthSalt,
+        'tableSalt' => $config->tableSalt,
+      ]);
+      $gitignore = $this->app->rootPath() . ".gitignore";
+      if (!is_file($gitignore)) {
+        file_put_contents($gitignore, "config-local.php\n");
       }
 
       // update config.php

diff --git a/App/stubs/config.php b/App/stubs/config.php
@@ -2,5 +2,6 @@
  * Load local config
  * Added via rockshell pw:install command.
  * This makes it possible to add config.php to your git project.
+ * Adjust this path if you are using a different docroot
  */
-require __DIR__ . "/../../config-local.php";
+require __DIR__ . "/config-local.php";