comment out NON required stuff thats currently broke

joemewes · Sep 14, 2016 · 0d5fad4 · 0d5fad4
1 parent 0b2286f
commit 0d5fad4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/bundles/d8/composer.json b/bundles/d8/composer.json
@@ -23,13 +23,14 @@
         "drupal/token": "8.*",
         "drupal/pathauto": "8.*",
         "drupal/adminimal_admin_toolbar": "8.x",
-        //"drupal/metatag": "8.x",
         "drupal/ctools": "8.x"
     },
     "require-dev": {
         "mikey179/vfsStream": "~1.2",
         "phpunit/phpunit": "~4.8",
-        "symfony/css-selector": "~2.8"
+        "symfony/css-selector": "~2.8",
+        "mbostock/d3": "~3.5",
+        "components/highlightjs": "~9.6"
     },
     "replace": {
         "drupal/core": "~8.3"
@@ -59,12 +60,7 @@
             "profiles/contrib/{$name}": ["type:drupal-profile"],
             "themes/contrib/{$name}": ["type:drupal-theme"],
             "libraries/{$name}": ["type:drupal-library"]
-        },
-//        "patches": {
-//            "drupal/metatag": {
-//                "DrupalConsole integration breaks Drush": "https://www.drupal.org/files/issues/metatag-n2786795-23.patch"
-//            }
-//        }
+        }
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php
@@ -267,6 +267,7 @@ private function setupD8($fs, $io, $appname){
         $fs->symlink($rel.'/profiles/custom', $app_dest.'/'.$buildpath.'/profiles/custom', true);
         $fs->symlink($rel.'/themes/custom', $app_dest.'/'.$buildpath.'/themes/custom', true);
 
+        $fs->chmod($app_dest.'/repository/config/sync', 0777, 0000, true);
         $fs->chmod($app_dest.'/'.$buildpath.'/sites/default/files', 0777, 0000, true);
         $fs->chmod($app_dest.'/'.$buildpath.'/sites/default/settings.php', 0777, 0000, true);
         $fs->chmod($app_dest.'/'.$buildpath.'/sites/default/settings.local.php', 0777, 0000, true);
@@ -300,7 +301,7 @@ private function setupExampleApp($fs, $io, $appname){
 
     }
 
-    private function installDrupal8($io){
+    private function installDrupal8($io, $install_helpers = FALSE){
         // Check for running mySQL container before launching Drupal Installation
         $message = 'Waiting for mySQL service.';
         $io->warning($message);
@@ -317,17 +318,18 @@ private function installDrupal8($io){
         $installcmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) drush site-install standard --account-name=dev --account-pass=admin --site-name=DockerDrupal [email protected] --db-url=mysql://dev:DEVPASSWORD@db:3306/dev_db --quiet -y';
         $this->runcommand($installcmd, $io, FALSE);
 
-        $message = 'Run APP composer update';
-        $io->text(' ');
-        $io->note($message);
-        $composercmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) composer update';
-        $this->runcommand($composercmd, $io, TRUE);
-
-        $message = 'Enable useful starter contrib modules';
-        $io->text(' ');
-        $io->note($message);
-        $drushcmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) drush en admin_toolbar ctools metatag redis token adminimal_admin_toolbar devel pathauto webprofiler -y';
-        $this->runcommand($drushcmd, $io, TRUE);
+        if($install_helpers) {
+          $message = 'Run APP composer update';
+          $io->note($message);
+          $composercmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) composer update';
+          $this->runcommand($composercmd, $io, TRUE);
+          $message = 'Enable useful starter contrib modules';
+          $io->note($message);
+          $drushcmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) drush en admin_toolbar ctools redis token adminimal_admin_toolbar devel pathauto webprofiler -y';
+          $this->runcommand($drushcmd, $io, TRUE);
+          $drushcmd = 'docker exec -i $(docker ps --format {{.Names}} | grep php) drush entity-updates -y';
+          $this->runcommand($drushcmd, $io, TRUE);
+        }
 
     }