Merge pull request #432 from sighupio/bugfix/legacy-vendor-override

fix: override ignored

.drone.yml

@@ -80,7 +80,8 @@ steps:
     depends_on:
       - prepare
     commands:
-      - apk add --update binutils curl groff openssh-client openvpn
+      - apk add curl && apk add --upgrade curl
+      - apk add --update binutils groff openssh-client openvpn
       # Install aws-cli
       - curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub
       - curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$${GLIBC_VER}/glibc-$${GLIBC_VER}.apk

cmd/legacy/vendor.go

@@ -99,8 +99,8 @@ func NewVendorCmd(tracker *analytics.Tracker) *cobra.Command {
 	cmd.Flags().StringP(
 		"furyfile",
 		"F",
-		"Furyfile.yml",
-		"Path to the Furyfile.yml file",
+		"Furyfile.yaml",
+		"Path to the Furyfile.yaml file",
 	)
 
 	cmd.Flags().StringP(

internal/legacy/furyfile.go

@@ -105,16 +105,20 @@ func (f *FuryFile) BuildPackages(prefix string) ([]Package, error) {
 	}
 
 	for i := range pkgs {
+		pkgs[i].ProviderKind = f.Provider[pkgs[i].Kind]
+		pkgs[i].Dir = newDir(f.VendorFolderName, pkgs[i]).getConsumableDirectory()
+
+		if pkgs[i].Version != "" {
+			continue
+		}
+
 		for k, v := range f.Versions {
 			if strings.HasPrefix(pkgs[i].Name, k) {
 				pkgs[i].Version = v
 
 				break
 			}
 		}
-
-		pkgs[i].ProviderKind = f.Provider[pkgs[i].Kind]
-		pkgs[i].Dir = newDir(f.VendorFolderName, pkgs[i]).getConsumableDirectory()
 	}
 
 	return pkgs, nil