Merge pull request #137 from spmzt/ungoogled_chromium

ungoogled-chromium support for FreeBSD (with updated PR126)

Makefile

@@ -88,6 +88,9 @@ crosscompile:
 	@echo -n ">> CROSSCOMPILE darwin/amd64"
 	@GOOS=darwin GOARCH=amd64 $(GO) build -o $(GOPASS_OUTPUT)-darwin-amd64
 	@printf '%s\n' '$(OK)'
+	@echo -n ">> CROSSCOMPILE freebsd/amd64"
+	@GOOS=freebsd GOARCH=amd64 $(GO) build -o $(GOPASS_OUTPUT)-freebsd-amd64
+	@printf '%s\n' '$(OK)'
 	@echo -n ">> CROSSCOMPILE windows/amd64"
 	@GOOS=windows GOARCH=amd64 $(GO) build -o $(GOPASS_OUTPUT)-windows-amd64
 	@printf '%s\n' '$(OK)'

internal/jsonapi/manifest/manifest.go

@@ -37,6 +37,8 @@ func renaderManifestContent(browser, wrapperPath string) ([]byte, error) {
 		fallthrough
 	case "chromium":
 		return newChromeManifest(wrapperPath).Format()
+	case "ungoogled-chromium":
+		return newChromeManifest(wrapperPath).Format()
 	default:
 		return nil, fmt.Errorf("no manifest template for browser %s", browser)
 	}

internal/jsonapi/manifest/manifest_path_freebsd.go

@@ -0,0 +1,18 @@
+package manifest
+
+var manifestPaths = &manifestPath{
+	local: map[string]string{
+		"firefox":  "~/.mozilla/native-messaging-hosts",
+		"chrome":   "~/.config/google-chrome/NativeMessagingHosts",
+		"chromium": "~/.config/chromium/NativeMessagingHosts",
+		"ungoogled-chromium": "~/.config/ungoogled-chromium/NativeMessagingHosts",
+		"iridium":  "~/.config/iridium/NativeMessagingHosts",
+	},
+	global: map[string]string{
+		"firefox":  "/usr/local/lib/mozilla/native-messaging-hosts", 
+		"chrome":   "/usr/local/lib/chrome/native-messaging-hosts",
+		"chromium": "/usr/local/lib/chromium/native-messaging-hosts",
+		"ungoogled-chromium": "/usr/local/lib/ungoogled-chromium/native-messaging-hosts",
+		"iridium":  "/usr/local/lib/iridium-browser/native-messaging-hosts",
+	},
+}

internal/jsonapi/manifest/manifest_path_others.go

@@ -1,5 +1,5 @@
-//go:build !linux && !darwin
-// +build !linux,!darwin
+//go:build !linux && !darwin && !freebsd
+// +build !linux,!darwin,!freebsd
 
 package manifest
 

internal/jsonapi/manifest/setup_test.go

@@ -59,6 +59,8 @@ func TestValidBrowsers(t *testing.T) {
 		validBrowsers = []string{"chrome", "chromium", "firefox"}
 	case "linux": // Linux
 		validBrowsers = []string{"brave", "chrome", "chromium", "firefox", "iridium", "slimjet", "vivaldi"}
+	case "freebsd": // FreeBSD
+		validBrowsers = []string{"chrome", "chromium", "ungoogled-chromium", "firefox", "iridium"}
 	default: // Fallback, not suppoerted OS
 		t.Fatalf("Unsupported OS: %s", runtime.GOOS)
 	}