Ensure Drupal8 detects the correct path for module/theme removal.

fubarhouse · Aug 30, 2017 · e373a03 · e373a03
1 parent 0941b13
commit e373a03
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/make/make.go b/make/make.go
@@ -235,7 +235,12 @@ func (Site *Site) ActionRebuildProject(Makefiles []string, Project string, GitPa
 	}
 
 	if moduleType != "" && moduleCat != "" {
-		ProjectDir := Site.Path + "/sites/all/" + moduleCat + "/" + moduleType + "/" + Project + "/"
+		var ProjectDir string
+		if MajorVersion < 8 {
+			ProjectDir = Site.Path + "/sites/all/" + moduleCat + "/" + moduleType + "/" + Project + "/"
+		} else {
+			ProjectDir = Site.Path + "/" + moduleCat + "/" + moduleType + "/" + Project + "/"
+		}
 		_, errMod := os.Stat(ProjectDir)
 		if errMod == nil {
 			*err = os.RemoveAll(ProjectDir)