Case 27689; handling builds that don't have a site root directory

Author: davidgrayston

src/Command/Site/AbstractCommand.php

@@ -241,6 +241,15 @@ protected function getSiteRoot() {
     return $this->siteRoot;
   }
 
+  /**
+   * Check if the current build has a site root directory.
+   *
+   * @return bool
+   */
+  protected function hasSiteRoot() {
+    return !is_null($this->siteRoot);
+  }
+
   /**
    * Helper to check that the config file exits and load the configuration.
    *

src/Command/Site/Checkout/AbstractRefCommand.php

@@ -192,13 +192,20 @@ protected function gitClone() {
    * @throws CommandException
    */
   protected function gitCheckout() {
-    $commands = [
-      sprintf('cd %s', $this->shellPath($this->getRoot())),
-      'git fetch --all',
-      sprintf('chmod 777 %ssites/default', $this->getWebRoot()),
-      sprintf('chmod 777 %ssites/default/settings.php', $this->getWebRoot()),
-      sprintf('git checkout %s --force', $this->ref),
-    ];
+
+    $commands = [];
+
+    // Fix site folder permissions.
+    if ($this->hasSiteRoot()) {
+      $commands[] = sprintf('chmod 777 %s', $this->getSiteRoot());
+      $commands[] = sprintf('chmod 777 %ssettings.php', $this->getSiteRoot());
+    }
+
+    // Checkout commands.
+    $commands[] = sprintf('cd %s', $this->shellPath($this->getRoot()));
+    $commands[] = 'git fetch --all';
+    $commands[] = sprintf('git checkout %s --force', $this->ref);
+
     $command = implode(' && ', $commands);
 
     $shellProcess = $this->getShellProcess();