Only set arch on bin dir when we are building for Windows

kolide · Sep 6, 2024 · 16b30e2 · 16b30e2
1 parent 7041121
commit 16b30e2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/pkg/packaging/detectLauncherVersion.go b/pkg/packaging/detectLauncherVersion.go
@@ -19,7 +19,10 @@ func (p *PackageOptions) detectLauncherVersion(ctx context.Context) error {
 	logger := log.With(ctxlog.FromContext(ctx), "library", "detectLauncherVersion")
 	level.Debug(logger).Log("msg", "Attempting launcher autodetection")
 
-	launcherPath := p.launcherLocation(filepath.Join(p.packageRoot, p.binDir, string(p.target.Arch)))
+	launcherPath := p.launcherLocation(filepath.Join(p.packageRoot, p.binDir))
+	if p.target.Platform == Windows {
+		launcherPath = p.launcherLocation(filepath.Join(p.packageRoot, p.binDir, string(p.target.Arch)))
+	}
 
 	stdout, err := p.execOut(ctx, launcherPath, "-version")
 	if err != nil {
@@ -51,9 +54,8 @@ func (p *PackageOptions) detectLauncherVersion(ctx context.Context) error {
 // fall back to the common location if it doesn't.
 func (p *PackageOptions) launcherLocation(binDir string) string {
 	if p.target.Platform == Darwin {
-		// We want /usr/local/Kolide.app, not /usr/local/bin/universal/Kolide.app, so we use Dir to strip out `bin`
-		// and universal
-		appBundleBinaryPath := filepath.Join(filepath.Dir(filepath.Dir(binDir)), "Kolide.app", "Contents", "MacOS", "launcher")
+		// We want /usr/local/Kolide.app, not /usr/local/bin/Kolide.app, so we use Dir to strip out `bin`
+		appBundleBinaryPath := filepath.Join(filepath.Dir(binDir), "Kolide.app", "Contents", "MacOS", "launcher")
 		if info, err := os.Stat(appBundleBinaryPath); err == nil && !info.IsDir() {
 			return appBundleBinaryPath
 		}

diff --git a/pkg/packaging/detectLauncherVersion_test.go b/pkg/packaging/detectLauncherVersion_test.go
@@ -95,7 +95,7 @@ func TestLauncherLocation(t *testing.T) {
 
 	// Create a temp directory with an app bundle in it
 	tmpDir := t.TempDir()
-	binDir := filepath.Join(tmpDir, "bin", "universal")
+	binDir := filepath.Join(tmpDir, "bin")
 	require.NoError(t, os.MkdirAll(binDir, 0755))
 	baseDir := filepath.Join(tmpDir, "Kolide.app", "Contents", "MacOS")
 	require.NoError(t, os.MkdirAll(baseDir, 0755))

diff --git a/pkg/packaging/fetch.go b/pkg/packaging/fetch.go
@@ -40,7 +40,9 @@ func FetchBinary(ctx context.Context, localCacheDir, name, binaryName, channelOr
 
 	// put binaries in arch specific directory to avoid naming collisions in wix msi building
 	// where a single destination will have multiple, mutally exclusive sources
-	localCacheDir = filepath.Join(localCacheDir, string(target.Arch))
+	if target.Platform == Windows {
+		localCacheDir = filepath.Join(localCacheDir, string(target.Arch))
+	}
 
 	if err := os.MkdirAll(localCacheDir, fsutil.DirMode); err != nil {
 		return "", fmt.Errorf("could not create cache directory: %w", err)
@@ -140,7 +142,11 @@ func dlTarPath(name, channelOrVersion, platform, arch string) (string, error) {
 }
 
 func dlTarPathFromVersion(name, version, platform, arch string) string {
-	return path.Join("kolide", name, platform, arch, fmt.Sprintf("%s-%s.tar.gz", name, version))
+	// 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))
 }
 
 //go:embed assets/tuf/root.json

diff --git a/pkg/packaging/packaging.go b/pkg/packaging/packaging.go
@@ -387,7 +387,10 @@ func (p *PackageOptions) getBinary(ctx context.Context, symbolicName, binaryName
 		return nil
 	}
 
-	binPath := filepath.Join(p.packageRoot, p.binDir, string(p.target.Arch), binaryName)
+	binPath := filepath.Join(p.packageRoot, p.binDir, binaryName)
+	if p.target.Platform == Windows {
+		binPath = filepath.Join(p.packageRoot, p.binDir, string(p.target.Arch), binaryName)
+	}
 	if err := os.MkdirAll(filepath.Dir(binPath), fsutil.DirMode); err != nil {
 		return fmt.Errorf("could not create directory for binary %s: %w", binaryName, err)
 	}