2 files changed, 20 insertions, 2 deletions
diff --git a/cmd/podman/utils/utils.go b/cmd/podman/utils/utils.go
index 73bb34983..2ae123388 100644
--- a/cmd/podman/utils/utils.go
+++ b/cmd/podman/utils/utils.go
@@ -44,7 +44,7 @@ func PrintPodPruneResults(podPruneReports []*entities.PodPruneReport, heading bo
 
 func PrintContainerPruneResults(containerPruneReports []*reports.PruneReport, heading bool) error {
 	var errs OutputErrors
-	if heading && (len(containerPruneReports) > 0) {
+	if heading && len(containerPruneReports) > 0 {
 		fmt.Println("Deleted Containers")
 	}
 	for _, v := range containerPruneReports {
@@ -72,7 +72,7 @@ func PrintVolumePruneResults(volumePruneReport []*reports.PruneReport, heading b
 }
 
 func PrintImagePruneResults(imagePruneReports []*reports.PruneReport, heading bool) error {
-	if heading {
+	if heading && len(imagePruneReports) > 0 {
 		fmt.Println("Deleted Images")
 	}
 	for _, r := range imagePruneReports {
diff --git a/cmd/winpath/main.go b/cmd/winpath/main.go
index 6fbe72837..b7aa7330d 100644
--- a/cmd/winpath/main.go
+++ b/cmd/winpath/main.go
@@ -12,6 +12,7 @@ import (
 	"syscall"
 	"unsafe"
 
+	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 )
 
@@ -26,6 +27,7 @@ const (
 	Environment                = "Environment"
 	Add              operation = iota
 	Remove
+	Open
 	NotSpecified
 )
 
@@ -37,6 +39,8 @@ func main() {
 			op = Add
 		case "remove":
 			op = Remove
+		case "open":
+			op = Open
 		}
 	}
 
@@ -46,6 +50,14 @@ func main() {
 		os.Exit(ERR_BAD_ARGS)
 	}
 
+	// Hidden operation as a workaround for the installer
+	if op == Open && len(os.Args) > 2 {
+		if err := winOpenFile(os.Args[2]); err != nil {
+			os.Exit(OPERATION_FAILED)
+		}
+		os.Exit(0)
+	}
+
 	if err := modify(op); err != nil {
 		os.Exit(OPERATION_FAILED)
 	}
@@ -182,3 +194,9 @@ func alert(caption string) int {
 
 	return int(ret)
 }
+
+func winOpenFile(file string) error {
+	verb, _ := syscall.UTF16PtrFromString("open")
+	fileW, _ := syscall.UTF16PtrFromString(file)
+	return windows.ShellExecute(0, verb, fileW, nil, nil, windows.SW_NORMAL)
+}