subdirectories of commands/* should not show up as custom commands (#…

…2060)
ddev · Feb 4, 2020 · de89fd2 · de89fd2
1 parent be0f12e
commit de89fd2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cmd/ddev/cmd/commands.go b/cmd/ddev/cmd/commands.go
@@ -49,14 +49,16 @@ func addCustomCommands(rootCmd *cobra.Command) error {
 		}
 
 		for _, commandName := range commandFiles {
-			if strings.HasSuffix(commandName, ".example") || strings.HasPrefix(commandName, "README") || strings.HasPrefix(commandName, ".") || fileutil.IsDirectory(commandName) {
-				continue
-			}
+
 			// Use path.Join() for the inContainerFullPath because it's about the path in the container, not on the
 			// host; a Windows path is not useful here.
 			inContainerFullPath := path.Join("/mnt/ddev_config/commands", service, commandName)
 			onHostFullPath := filepath.Join(topCommandPath, service, commandName)
 
+			if strings.HasSuffix(commandName, ".example") || strings.HasPrefix(commandName, "README") || strings.HasPrefix(commandName, ".") || fileutil.IsDirectory(onHostFullPath) {
+				continue
+			}
+
 			// Any command we find will want to be executable on Linux
 			_ = os.Chmod(onHostFullPath, 0755)