Fixes #1180, #1182: BLT should ignore sites/g entirely. (#1188)

acquia · Mar 14, 2017 · 5ffea2e · 5ffea2e
1 parent 078cb69
commit 5ffea2e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/phing/tasks/properties.xml b/phing/tasks/properties.xml
@@ -66,8 +66,8 @@
       <if>
         <available file="${docroot}/sites"/>
         <then>
-          <!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. -->
-          <exec command="find ${docroot}/sites/* -maxdepth 0 -type d | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
+          <!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. Exclude ${docroot}/sites/g. -->
+          <exec command="find ${docroot}/sites/* -maxdepth 0 -type d | grep -v -e '${docroot}/sites/g$' | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
                 outputProperty="multisite.name" logoutput="false" checkreturn="true"/>
         </then>
         <else>

diff --git a/tests/phpunit/phpunit.xml b/tests/phpunit/phpunit.xml
@@ -5,7 +5,7 @@
     <php>
         <const name="BLT_ENV" value="ci"/>
         <const name="BLT_ALIAS" value="self"/>
-        <const name="BLT_MULTISITE_NAME" value="default,g"/>
+        <const name="BLT_MULTISITE_NAME" value="default"/>
     </php>
 
 </phpunit>