Merge pull request #20 from NuCivic/fix-override-link

Update overrides.php
GetDKAN · Nov 4, 2016 · 5104bf0 · 5104bf0
2 parents bb57e22 + 181a20a
commit 5104bf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.ahoy/site/.scripts/overrides.php b/.ahoy/site/.scripts/overrides.php
@@ -5,8 +5,8 @@
 
 try {
   $yaml = new Parser();
-  $overrides_make = $yaml->parse(file_get_contents(__DIR__ . '/../../../../config/overrides.make'));
-  $drupal_org_make = make_parse_info_file(realpath(__DIR__ . '/../../../../dkan/drupal-org.make'));
+  $overrides_make = $yaml->parse(file_get_contents(__DIR__ . '/../../../config/overrides.make'));
+  $drupal_org_make = make_parse_info_file(realpath(__DIR__ . '/../../../dkan/drupal-org.make'));
 
   if (is_array($overrides_make) && is_array($drupal_org_make))  {
     if (isset($overrides_make['projects']['drupal'])) {
@@ -22,7 +22,7 @@
     }
     $dumper = new Dumper();
     $overriden_yaml = $dumper->dump($overrides_make, 4);
-    file_put_contents(__DIR__ . '/../../../../overriden_make.make', $overriden_yaml);
+    file_put_contents(__DIR__ . '/../../../overriden_make.make', $overriden_yaml);
   }
 
 } catch (Exception $e) {

diff --git a/.ahoy/site/build.ahoy.yml b/.ahoy/site/build.ahoy.yml
@@ -89,7 +89,7 @@ commands:
     usage: Overrides drupal-org.make with overrides.make
     cmd: |
       if [ -f config/overrides.make ]; then
-        cd .ahoy/site && composer install && cd ..
+        cd .ahoy/site && composer install && cd -
         ahoy cmd-proxy drush php-script .ahoy/site/.scripts/overrides.php
         # Check file exits and file not empty.
         if [ -e overriden_make.make ] && [ -s overriden_make.make ]; then