Keep downloading arch-specific binary for all OSes

pkg/packaging/fetch.go

@@ -38,7 +38,7 @@ func FetchBinary(ctx context.Context, localCacheDir, name, binaryName, channelOr
 		return "", errors.New("empty cache dir argument")
 	}
 
-	// put binaries in arch specific directory to avoid naming collisions in wix msi building
+	// put binaries in arch specific directory for Windows to avoid naming collisions in wix msi building
 	// where a single destination will have multiple, mutally exclusive sources
 	if target.Platform == Windows {
 		localCacheDir = filepath.Join(localCacheDir, string(target.Arch))
@@ -142,11 +142,7 @@ func dlTarPath(name, channelOrVersion, platform, arch string) (string, error) {
 }
 
 func dlTarPathFromVersion(name, version, platform, arch string) string {
-	// Include arch for Windows
-	if platform == string(Windows) {
-		return path.Join("kolide", name, platform, arch, fmt.Sprintf("%s-%s.tar.gz", name, version))
-	}
-	return path.Join("kolide", name, platform, fmt.Sprintf("%s-%s.tar.gz", name, version))
+	return path.Join("kolide", name, platform, arch, fmt.Sprintf("%s-%s.tar.gz", name, version))
 }
 
 //go:embed assets/tuf/root.json