Skip to content

Commit 634d3fa

Browse files
committed
adding a configDir option
1 parent 08a7f4e commit 634d3fa

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

src/PatternLab/Config.php

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,16 @@ public static function init($baseDir = "", $verbose = true) {
9797
// set the baseDir option
9898
self::$options["baseDir"] = ($baseDir[strlen($baseDir)-1] == DIRECTORY_SEPARATOR) ? $baseDir : $baseDir.DIRECTORY_SEPARATOR;
9999

100+
// set-up the paths
101+
self::$userConfigDirClean = self::$options["baseDir"].self::$userConfigDirClean;
102+
self::$userConfigDirDash = self::$options["baseDir"].self::$userConfigDirDash;
103+
self::$userConfigDir = (is_dir(self::$userConfigDirDash)) ? self::$userConfigDirDash : self::$userConfigDirClean;
104+
self::$userConfigPath = self::$userConfigDir.DIRECTORY_SEPARATOR.self::$userConfig;
105+
self::$plConfigPath = self::$options["baseDir"]."vendor/pattern-lab/core/".self::$plConfigPath;
106+
100107
// can't add __DIR__ above so adding here
101-
if (!self::$dirAdded) {
102-
103-
// set-up the paths
104-
self::$userConfigDirClean = self::$options["baseDir"].self::$userConfigDirClean;
105-
self::$userConfigDirDash = self::$options["baseDir"].self::$userConfigDirDash;
106-
self::$userConfigDir = (is_dir(self::$userConfigDirDash)) ? self::$userConfigDirDash : self::$userConfigDirClean;
107-
self::$userConfigPath = self::$userConfigDir.DIRECTORY_SEPARATOR.self::$userConfig;
108-
self::$plConfigPath = self::$options["baseDir"]."vendor/pattern-lab/core/".self::$plConfigPath;
109-
self::$dirAdded = true;
110-
111-
// just in case the config directory doesn't exist at all
112-
if (!is_dir(self::$userConfigDir)) {
113-
mkdir(self::$userConfigDir);
114-
}
115-
108+
if (!is_dir(self::$userConfigDir)) {
109+
mkdir(self::$userConfigDir);
116110
}
117111

118112
// make sure migrate doesn't happen by default

0 commit comments

Comments
 (0)