Skip to content

Commit

Permalink
assume target specifications are relative to release root
Browse files Browse the repository at this point in the history
there's no way this change didn't introduce a boat load of bugs.
femnad committed Aug 24, 2024
1 parent 7354168 commit d944b81
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions provision/release.go
Original file line number Diff line number Diff line change
@@ -62,6 +62,7 @@ type extractionFn func(ReleaseInfo, extractionHint) error
type ReleaseInfo struct {
execCandidate string
hasRootDir bool
absRoot string
absTarget string
relTarget string
targetOverride string
@@ -100,6 +101,15 @@ func downloadRelease(release entity.Release, s settings.Settings) (string, error
return downloadTempFile(response)
}

func releaseRoot(absTarget string) string {
dir, base := path.Split(absTarget)
if dir == "" {
return base
}

return releaseRoot(path.Clean(dir))
}

func processDownload(release entity.Release, s settings.Settings) (info ReleaseInfo, err error) {
tempFile, err := downloadRelease(release, s)
if err != nil {
@@ -140,9 +150,13 @@ func processDownload(release entity.Release, s settings.Settings) (info ReleaseI
}
}

// We need this because absTarget refers to the path where the release executable resides.
root := releaseRoot(info.relTarget)
absRoot := path.Join(dirName, root)

var chromeSandbox string
if release.ChromeSandbox != "" {
chromeSandbox = path.Join(absTarget, release.ChromeSandbox)
chromeSandbox = path.Join(absRoot, release.ChromeSandbox)
err = internal.EnsureFileAbsent(chromeSandbox)
if err != nil {
return info, fmt.Errorf("error removing chrome-sandbox file %s: %v", chromeSandbox, err)
@@ -176,6 +190,7 @@ func processDownload(release entity.Release, s settings.Settings) (info ReleaseI
}

info.absTarget = absTarget
info.absRoot = absRoot
return
}

@@ -736,7 +751,7 @@ func ensureRelease(release entity.Release, s settings.Settings) error {
return err
}

target := info.absTarget
target := info.absRoot
if info.targetOverride != "" {
target, _ = path.Split(target)
target = path.Join(target, info.targetOverride)

0 comments on commit d944b81

Please sign in to comment.