Merge pull request #3414 from ActiveState/mitchell/dx-2870

Only remove the installation.InstallDirMarker after binaries were successfully removed.

internal/assets/contents/scripts/removePaths.bat

@@ -32,17 +32,19 @@ echo "Waiting for process %exe% with PID %pid% to end..." >> %logfile%
 echo "Process %exe% has ended" >> %logfile%
 set success=true
 for %%i in (%paths%) do (
-    echo "Attempting to remove path %%i" >> %logfile%
-    if exist "%%i\" (
-        rmdir /s /q %%i 2>>&1 >> %logfile%
-    ) else if exist "%%i" (
-        del /f /q %%i 2>>&1 >> %logfile%
-    )
-    if exist "%%i" (
-        echo "Could not remove path: %%i" >> %logfile%
-        set success=false
-    ) else (
-        echo "Successfully removed path %%i" >> %logfile%
+    if "%success%"=="true" (
+        echo "Attempting to remove path %%i" >> %logfile%
+        if exist "%%i\" (
+            rmdir /s /q %%i 2>>&1 >> %logfile%
+        ) else if exist "%%i" (
+            del /f /q %%i 2>>&1 >> %logfile%
+        )
+        if exist "%%i" (
+            echo "Could not remove path: %%i" >> %logfile%
+            set success=false
+        ) else (
+            echo "Successfully removed path %%i" >> %logfile%
+        )
     )
 )
 

internal/runners/clean/run_lin_mac.go

@@ -205,14 +205,13 @@ func cleanInstallDir(dir string, cfg *config.Instance) error {
 	}
 
 	var asFiles = []string{
-		installation.InstallDirMarker,
 		constants.StateInstallerCmd + osutils.ExeExtension,
 	}
 
-	// Remove all of the state tool executables and finally the
-	// bin directory
+	// Remove all of the state tool executables, bin directory, and finally the install marker.
 	asFiles = append(asFiles, execs...)
 	asFiles = append(asFiles, installation.BinDirName)
+	asFiles = append(asFiles, installation.InstallDirMarker)
 
 	for _, file := range asFiles {
 		f := filepath.Join(dir, file)

internal/runners/clean/run_win.go

@@ -116,14 +116,19 @@ func removeInstall(logFile string, params *UninstallParams, cfg *config.Instance
 		return locale.WrapError(err, "err_state_exec")
 	}
 
-	// Schedule removal of the entire install directory.
+	// Schedule ordered removal of the entire install directory.
 	// This is because Windows often thinks the installation.InstallDirMarker and
 	// constants.StateInstallerCmd files are still in use.
 	installDir, err := installation.InstallPathFromExecPath()
 	if err != nil {
 		return errs.Wrap(err, "Could not get installation path")
 	}
-	paths := []string{stateExec, installDir}
+	paths := []string{
+		stateExec,
+		filepath.Join(installDir, installation.BinDirName),
+		filepath.Join(installDir, installation.InstallDirMarker), // should be after bin
+		installDir,
+	}
 	if params.All {
 		paths = append(paths, cfg.ConfigPath()) // also remove the config directory
 	}