Skip to content

Uninstall on Windows should remove the same files as on macOS/Linux #2401

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

Merged
mitchell-as merged 2 commits into from
Mar 1, 2023
Merged

Uninstall on Windows should remove the same files as on macOS/Linux #2401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c85347
Always delete the entire branch name directory during uninstall.
mitchell-as Feb 28, 2023
6b4f094
Use "InTest" instead of "OnCI".
mitchell-as Mar 1, 2023
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
19 changes: 12 additions & 7 deletions internal/runners/clean/run_win.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"path/filepath"

"github.com/ActiveState/cli/internal/assets"
"github.com/ActiveState/cli/internal/condition"
"github.com/ActiveState/cli/internal/config"
"github.com/ActiveState/cli/internal/errs"
"github.com/ActiveState/cli/internal/exeutils"
Expand Down Expand Up @@ -106,14 +107,18 @@ func removeInstall(logFile string, params *UninstallParams, cfg *config.Instance
return locale.WrapError(err, "err_state_exec")
}

paths := []string{}
// Schedule removal of the entire branch name directory.
// This is because Windows often thinks the installation.InstallDirMarker and
// constants.StateInstallerCmd files are still in use.
branchDir := filepath.Dir(filepath.Dir(stateExec))
if condition.InTest() && !params.All {
// On CI, the installation root also contains cache and config directories, and they should
// not be removed. Instead, just remove the installation bin directory.
branchDir = filepath.Dir(stateExec)
}
paths := []string{branchDir}
if params.All {
// Schedule removal of the branch name directory and the config directory
paths = append(paths, filepath.Dir(filepath.Dir(stateExec)))
paths = append(paths, cfg.ConfigPath())
} else {
// Schedule the removal of just the bin directory.
paths = append(paths, filepath.Dir(stateExec))
paths = append(paths, cfg.ConfigPath()) // also remove the config directory
}
// If the transitional state tool path is known, we remove it. This is done in the background, because the transitional State Tool can be the initiator of the uninstall request
if transitionalStateTool := cfg.GetString(installation.CfgTransitionalStateToolPath); transitionalStateTool != "" {
Expand Down