Fix yaml path (#17)

enhavo · Oct 26, 2021 · 811ae0a · 811ae0a
1 parent b8591a0
commit 811ae0a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/Configuration/Factory.php b/src/Configuration/Factory.php
@@ -32,6 +32,10 @@ protected function findGlobalConfigFile()
         if (file_exists($configFile)) {
             return $configFile;
         }
+        $configFile = sprintf('%s/.enhavo/config.yml', $home);
+        if (file_exists($configFile)) {
+            return $configFile;
+        }
         return null;
     }
 
@@ -44,6 +48,10 @@ protected function findLocalConfigFile()
         if (file_exists($configFile)) {
             return $configFile;
         }
+        $configFile = sprintf('%s/.enhavo.yml', getcwd());
+        if (file_exists($configFile)) {
+            return $configFile;
+        }
         return null;
     }
 

diff --git a/src/Subroutine/VendorSymlink.php b/src/Subroutine/VendorSymlink.php
@@ -101,6 +101,10 @@ private function findMainPackagePath()
 
         foreach ($mainRepositories as $mainRepository) {
             $configPath = sprintf('%s/.enhavo.yaml', $mainRepository);
+            if(!$this->fs->exists($configPath)) {
+                $configPath = sprintf('%s/.enhavo.yml', $mainRepository);
+            }
+
             if ($this->fs->exists($configPath)) {
                 $configuration = new Configuration();
                 $this->factory->readFromFile($configPath, $configuration);

diff --git a/src/Task/EditConfig.php b/src/Task/EditConfig.php
@@ -12,7 +12,10 @@ class EditConfig extends AbstractSubroutine
     public function __invoke()
     {
         $home = getenv("HOME");
-        $path = sprintf("%s/.enhavo/config.yaml", realpath($home));
+        $path = sprintf("%s/.enhavo/config.yml", realpath($home));
+        if (file_exists($path)) {
+            $path = sprintf("%s/.enhavo/config.yaml", realpath($home));
+        }
         return $this->execute(['vim', $path], $this->output);
     }
 }