fix(cli): collection install path (#60)

Author: saitho

ansible/collection.go

@@ -55,11 +55,11 @@ func GetCollectionDirs() ([]string, error) {
 	var pathEnv = os.Getenv("COLLECTIONS_PATHS")
 	var pathList []string
 	if pathEnv == "" {
-		pathList = []string{homeDir + "/.ansible/collections/ansible_collections"}
+		pathList = []string{homeDir + "/.ansible/collections"}
 	} else {
 		pathList = strings.Split(pathEnv, ":")
 		if len(pathList) == 0 {
-			pathList = []string{homeDir + "/.ansible/collections/ansible_collections"}
+			pathList = []string{homeDir + "/.ansible/collections"}
 		}
 	}
 	return pathList, nil
@@ -73,7 +73,7 @@ func GetStackHeadCollectionLocation() (string, error) {
 	}
 	// Look for Ansible directory
 	for _, singlePath := range collectionDirs {
-		var installPath = filepath.Join(singlePath, "getstackhead", "stackhead")
+		var installPath = filepath.Join(singlePath, "ansible_collections", "getstackhead", "stackhead")
 		if _, err := os.Stat(installPath); !os.IsNotExist(err) {
 			return installPath, nil
 		}

routines/exec.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 
 	"github.com/spf13/viper"
@@ -48,7 +49,15 @@ func ExecAnsibleGalaxy(args ...string) error {
 	if err != nil {
 		return err
 	}
-	args = append(args, "-p "+collectionDir[0])
+
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	// We have to set a relative path, otherwise ansible-galaxy will do weird things...
+	relCollectionsPath, _ := filepath.Rel(cwd, "/")
+	args = append(args, "-p "+relCollectionsPath+"/../.."+collectionDir[0])
 	return Exec("ansible-galaxy", args...)
 }