Skip to content

Commit 18456a9

Browse files
committed
Add the filepath
1 parent 1fad3b2 commit 18456a9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

magefile.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1174,15 +1174,15 @@ func collectPackageDependencies(platforms []string, packageVersion string, requi
11741174
return archivePath, dropPath
11751175
}
11761176

1177-
func getIndAgentGlobExpr(packageVersion string) string {
1177+
func getIndAgentGlobExpr(versionedFlatPath string, packageVersion string) string {
11781178
parsedPackageVersion, err := version.ParseVersion(packageVersion)
11791179
if err != nil {
11801180
panic(err)
11811181
}
11821182

11831183
bumpedPatchNumber := parsedPackageVersion.Patch() + 1
11841184

1185-
globExpr := fmt.Sprintf("*%d.%d.[%d|%d]*", parsedPackageVersion.Major(), parsedPackageVersion.Minor(), parsedPackageVersion.Patch(), bumpedPatchNumber)
1185+
globExpr := filepath.Join(versionedFlatPath, fmt.Sprintf("*%d.%d.[%d|%d]*", parsedPackageVersion.Major(), parsedPackageVersion.Minor(), parsedPackageVersion.Patch(), bumpedPatchNumber))
11861186

11871187
return globExpr
11881188
}
@@ -1233,7 +1233,7 @@ func flattenDependencies(requiredPackages []string, packageVersion, archivePath,
12331233
}
12341234

12351235
//globExpr := filepath.Join(versionedFlatPath, fmt.Sprintf("*%s*", packageVersion))
1236-
globExpr := getIndAgentGlobExpr(packageVersion)
1236+
globExpr := getIndAgentGlobExpr(versionedFlatPath, packageVersion)
12371237
if mg.Verbose() {
12381238
log.Printf("Finding files to copy with %s", globExpr)
12391239
}

0 commit comments

Comments
 (0)