Adjust update for windows.

PortableSheep · PortableSheep · commit 6fc28832d12e · 2026-03-07T20:37:21.000-06:00
diff --git a/cmd/rawrequest-updater/updater_main.go b/cmd/rawrequest-updater/updater_main.go
@@ -173,10 +173,11 @@ func dief(format string, args ...any) {
 }
 
 func installParentDir(installPath string) string {
-	if strings.HasSuffix(strings.ToLower(installPath), ".app") {
-		return filepath.Dir(installPath)
+	parent := filepath.Dir(installPath)
+	if parent == "" {
+		return installPath
 	}
-	return installPath
+	return parent
 }
 
 func ensureDirWritable(dir string) error {
diff --git a/frontend/src/app/components/update-notification/update-notification.component.ts b/frontend/src/app/components/update-notification/update-notification.component.ts
@@ -13,10 +13,16 @@ export class UpdateNotificationComponent {
   protected updateService = inject(UpdateService);
 
   async downloadOrRestart(): Promise<void> {
+    // Capture before the call — if the update is already downloaded, the Go
+    // side will launch the updater helper and quit the app.  The Wails runtime
+    // teardown will sever the RPC channel, causing the await to reject. That
+    // rejection is expected and must not trigger the browser-open fallback.
+    const isRestart = this.updateService.isUpdateReady();
+
     const started = await this.updateService.startUpdateAndRestart();
-    if (!started) {
+    if (!started && !isRestart) {
       await this.updateService.openReleasePage();
-		this.updateService.remindLater();
+      this.updateService.remindLater();
     }
   }
 
diff --git a/internal/updateapplylogic/install_parent.go b/internal/updateapplylogic/install_parent.go
@@ -7,11 +7,12 @@ import (
 )
 
 func InstallParentDir(installPath string) (string, error) {
-	parent := installPath
-	if strings.HasSuffix(strings.ToLower(strings.TrimSpace(installPath)), ".app") {
-		parent = filepath.Dir(installPath)
+	trimmed := strings.TrimSpace(installPath)
+	if trimmed == "" {
+		return "", errors.New("could not determine install parent directory")
 	}
-	if strings.TrimSpace(parent) == "" {
+	parent := filepath.Dir(trimmed)
+	if parent == "" || parent == trimmed {
 		return "", errors.New("could not determine install parent directory")
 	}
 	return parent, nil
diff --git a/internal/updateapplylogic/install_parent_test.go b/internal/updateapplylogic/install_parent_test.go
@@ -10,9 +10,10 @@ func TestInstallParentDir(t *testing.T) {
 		wantErr string
 	}{
 		{name: "empty", path: "", want: "", wantErr: "could not determine install parent directory"},
-		{name: "regular path", path: "/Applications/RawRequest", want: "/Applications/RawRequest", wantErr: ""},
+		{name: "regular path", path: "/Applications/RawRequest", want: "/Applications", wantErr: ""},
 		{name: "app bundle", path: "/Applications/RawRequest.app", want: "/Applications", wantErr: ""},
 		{name: "app bundle case-insensitive", path: "/Applications/RawRequest.APP", want: "/Applications", wantErr: ""},
+		{name: "windows install dir", path: "C:/Apps/RawRequest", want: "C:/Apps", wantErr: ""},
 	}
 
 	for _, tt := range tests {

Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,11 @@ func dief(format string, args ...any) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`func installParentDir(installPath string) string {`
`176`		`- if strings.HasSuffix(strings.ToLower(installPath), ".app") {`
`177`		`- return filepath.Dir(installPath)`
	`176`	`+ parent := filepath.Dir(installPath)`
	`177`	`+ if parent == "" {`
	`178`	`+ return installPath`
`178`	`179`	`}`
`179`		`- return installPath`
	`180`	`+ return parent`
`180`	`181`	`}`
`181`	`182`
`182`	`183`	`func ensureDirWritable(dir string) error {`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,12 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func InstallParentDir(installPath string) (string, error) {`
`10`		`- parent := installPath`
`11`		`- if strings.HasSuffix(strings.ToLower(strings.TrimSpace(installPath)), ".app") {`
`12`		`- parent = filepath.Dir(installPath)`
	`10`	`+ trimmed := strings.TrimSpace(installPath)`
	`11`	`+ if trimmed == "" {`
	`12`	`+ return "", errors.New("could not determine install parent directory")`
`13`	`13`	`}`
`14`		`- if strings.TrimSpace(parent) == "" {`
	`14`	`+ parent := filepath.Dir(trimmed)`
	`15`	`+ if parent == "" \|\| parent == trimmed {`
`15`	`16`	`return "", errors.New("could not determine install parent directory")`
`16`	`17`	`}`
`17`	`18`	`return parent, nil`