re #123 - Running the packaged box fails to find config.custom.yaml

joomlatools · Aug 22, 2014 · 1c00ba7 · 1c00ba7
1 parent 895de5f
commit 1c00ba7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ To view the diff between two versions, go to https://github.com/joomlatools/joom
  * Added - Share the path mappings with guest box through BOX_SHARED_PATHS environment variable.
  * Added - Install PECL yaml by default.
  * Fixed - Fixed broken mysql-5.1.73 download link.
+ * Fixed - Running the box straight from `joomlatools/box` fails to find the _config.custom.yaml_ file.
 
 * 1.2.1 (2014-07-04)
  * Added - Created a basic dashboard in the root path

diff --git a/Vagrantfile b/Vagrantfile
@@ -18,7 +18,7 @@ _config = {
 
 # Local-specific/not-git-managed config -- config.custom.yaml
 begin
-  deep_merge!(_config, YAML.load(File.open(File.join(File.dirname(__FILE__), "config.custom.yaml"), File::RDONLY).read))
+  deep_merge!(_config, YAML.load(File.open(File.join(Dir.pwd, "config.custom.yaml"), File::RDONLY).read))
 rescue Errno::ENOENT
   # No config.custom.yaml found -- that's OK; just use the defaults.
 end

diff --git a/Vagrantfile.pkg b/Vagrantfile.pkg
@@ -18,7 +18,7 @@ _config = {
 
 # Local-specific/not-git-managed config -- config.custom.yaml
 begin
-  deep_merge!(_config, YAML.load(File.open(File.join(File.dirname(__FILE__), "config.custom.yaml"), File::RDONLY).read))
+  deep_merge!(_config, YAML.load(File.open(File.join(Dir.pwd, "config.custom.yaml"), File::RDONLY).read))
 rescue Errno::ENOENT
   # No config.custom.yaml found -- that's OK; just use the defaults.
 end