Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use installation package for directory determination. #2940

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Use installation package for directory determination. #2940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions internal/runners/clean/run_win.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,14 @@ func removeInstall(logFile string, params *UninstallParams, cfg *config.Instance
return locale.WrapError(err, "err_state_exec")
}

// Schedule removal of the entire branch name directory.
// Schedule removal of the entire install directory.
// This is because Windows often thinks the installation.InstallDirMarker and
// constants.StateInstallerCmd files are still in use.
branchDir := filepath.Dir(filepath.Dir(stateExec))
paths := []string{stateExec, branchDir}
installDir, err := installation.InstallPathFromExecPath()
if err != nil {
return errs.Wrap(err, "Could not get installation path")
}
paths := []string{stateExec, installDir}
if params.All {
paths = append(paths, cfg.ConfigPath()) // also remove the config directory
}
Expand Down
Loading