From 650c272301e0f97eb113c003c8fc2f2c7b5aed69 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Tue, 12 Apr 2022 16:56:33 +0200
Subject: [PATCH] Only fix chrome sandbox permission when needed

---
 cmds/portmaster-start/update.go | 8 +++++---
 updates/helper/electron.go      | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmds/portmaster-start/update.go b/cmds/portmaster-start/update.go
index 3f70bfc3..e57b9b69 100644
--- a/cmds/portmaster-start/update.go
+++ b/cmds/portmaster-start/update.go
@@ -106,9 +106,11 @@ func downloadUpdates() error {
 		return fmt.Errorf("failed to unpack resources: %w", err)
 	}
 
-	// Fix chrome-sandbox permissions
-	if err := helper.EnsureChromeSandboxPermissions(registry); err != nil {
-		return fmt.Errorf("failed to fix electron permissions: %w", err)
+	if !intelOnly {
+		// Fix chrome-sandbox permissions
+		if err := helper.EnsureChromeSandboxPermissions(registry); err != nil {
+			return fmt.Errorf("failed to fix electron permissions: %w", err)
+		}
 	}
 
 	return nil
diff --git a/updates/helper/electron.go b/updates/helper/electron.go
index ca9ba1b7..833c1c91 100644
--- a/updates/helper/electron.go
+++ b/updates/helper/electron.go
@@ -1,6 +1,7 @@
 package helper
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -34,6 +35,9 @@ func EnsureChromeSandboxPermissions(reg *updater.ResourceRegistry) error {
 	var err error
 	pmElectronUpdate, err = reg.GetFile(identifier)
 	if err != nil {
+		if errors.Is(err, updater.ErrNotAvailableLocally) {
+			return nil
+		}
 		return fmt.Errorf("failed to get file: %w", err)
 	}