diff --git a/bin/omarchy-default-browser b/bin/omarchy-default-browser index 10f96736..1b7baf07 100755 --- a/bin/omarchy-default-browser +++ b/bin/omarchy-default-browser @@ -9,7 +9,7 @@ if (($# == 0)); then chromium.desktop) echo "chromium" ;; google-chrome.desktop) echo "chrome" ;; brave-browser.desktop) echo "brave" ;; - brave-origin-beta.desktop) echo "brave-origin" ;; + brave-origin.desktop) echo "brave-origin" ;; microsoft-edge.desktop) echo "edge" ;; firefox.desktop) echo "firefox" ;; zen.desktop) echo "zen" ;; @@ -22,7 +22,7 @@ case "$1" in chromium) desktop_id="chromium.desktop"; name="Chromium"; glyph= ;; chrome) desktop_id="google-chrome.desktop"; name="Chrome"; glyph=󰊯 ;; brave) desktop_id="brave-browser.desktop"; name="Brave"; glyph=󰖟 ;; -brave-origin) desktop_id="brave-origin-beta.desktop"; name="Brave Origin"; glyph=󰖟 ;; +brave-origin) desktop_id="brave-origin.desktop"; name="Brave Origin"; glyph=󰖟 ;; edge) desktop_id="microsoft-edge.desktop"; name="Edge"; glyph=󰇩 ;; firefox) desktop_id="firefox.desktop"; name="Firefox"; glyph=󰈹 ;; zen) desktop_id="zen.desktop"; name="Zen"; glyph=󰖟 ;; diff --git a/bin/omarchy-install-browser b/bin/omarchy-install-browser index 18a97c6e..66ed2f54 100755 --- a/bin/omarchy-install-browser +++ b/bin/omarchy-install-browser @@ -62,13 +62,10 @@ brave) ;; brave-origin) echo "Installing Brave Origin..." - omarchy-pkg-aur-add brave-origin-beta-bin || exit 1 + omarchy-pkg-aur-add brave-origin-bin || exit 1 setup_policy_directory /etc/brave/policies/managed - mkdir -p ~/.config - # FIXME: Use normal chromium flags when Brave Origin wrapper has been fixed - echo "--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp" > ~/.config/brave-origin-beta-flags.conf - omarchy-install-chromium-ytdlp + copy_chromium_flags ~/.config/brave-origin-flags.conf omarchy-theme-set-browser announce_browser_installed "Brave Origin" ;; diff --git a/bin/omarchy-remove-browser b/bin/omarchy-remove-browser index b459d6ae..acba1db4 100755 --- a/bin/omarchy-remove-browser +++ b/bin/omarchy-remove-browser @@ -42,15 +42,15 @@ brave) omarchy-pkg-drop brave-bin rm -f ~/.config/brave-flags.conf - if omarchy-pkg-missing brave-origin-beta-bin; then + if omarchy-pkg-missing brave-origin-bin; then sudo rm -rf /etc/brave fi ;; brave-origin) echo "Removing Brave Origin..." - set_fallback_default_browser brave-origin-beta.desktop - omarchy-pkg-drop brave-origin-beta-bin - rm -f ~/.config/brave-origin-beta-flags.conf + set_fallback_default_browser brave-origin.desktop + omarchy-pkg-drop brave-origin-bin + rm -f ~/.config/brave-origin-flags.conf if omarchy-pkg-missing brave-bin; then sudo rm -rf /etc/brave diff --git a/bin/omarchy-theme-set-browser b/bin/omarchy-theme-set-browser index 7e5a7e15..4ffa27e7 100755 --- a/bin/omarchy-theme-set-browser +++ b/bin/omarchy-theme-set-browser @@ -41,4 +41,4 @@ refresh_running_browser msedge microsoft-edge-stable set_browser_policy /etc/brave/policies/managed refresh_running_browser brave brave -refresh_running_browser brave-origin-beta brave-origin-beta -f +refresh_running_browser brave-origin brave-origin -f diff --git a/default/omarchy/omarchy-menu.jsonc b/default/omarchy/omarchy-menu.jsonc index 7461dcdd..baa1f453 100644 --- a/default/omarchy/omarchy-menu.jsonc +++ b/default/omarchy/omarchy-menu.jsonc @@ -124,7 +124,7 @@ "setup.default.browser.chromium": {"icon":"","label":"Chromium","when":"omarchy-cmd-present chromium","checked":"[[ \"$(omarchy-default-browser)\" == \"chromium\" ]]","action":"omarchy-default-browser chromium"}, "setup.default.browser.chrome": {"icon":"󰊯","label":"Chrome","keywords":"google","when":"omarchy-cmd-present google-chrome-stable","checked":"[[ \"$(omarchy-default-browser)\" == \"chrome\" ]]","action":"omarchy-default-browser chrome"}, "setup.default.browser.brave": {"icon":"󰖟","label":"Brave","when":"omarchy-cmd-present brave","checked":"[[ \"$(omarchy-default-browser)\" == \"brave\" ]]","action":"omarchy-default-browser brave"}, - "setup.default.browser.brave-origin": {"icon":"󰖟","label":"Brave Origin","when":"omarchy-cmd-present brave-origin-beta","checked":"[[ \"$(omarchy-default-browser)\" == \"brave-origin\" ]]","action":"omarchy-default-browser brave-origin"}, + "setup.default.browser.brave-origin": {"icon":"󰖟","label":"Brave Origin","when":"omarchy-cmd-present brave-origin","checked":"[[ \"$(omarchy-default-browser)\" == \"brave-origin\" ]]","action":"omarchy-default-browser brave-origin"}, "setup.default.browser.edge": {"icon":"󰇩","label":"Edge","when":"omarchy-cmd-present microsoft-edge-stable","checked":"[[ \"$(omarchy-default-browser)\" == \"edge\" ]]","action":"omarchy-default-browser edge"}, "setup.default.browser.firefox": {"icon":"󰈹","label":"Firefox","when":"omarchy-cmd-present firefox","checked":"[[ \"$(omarchy-default-browser)\" == \"firefox\" ]]","action":"omarchy-default-browser firefox"}, "setup.default.browser.zen": {"icon":"󰖟","label":"Zen","when":"omarchy-cmd-present zen-browser","checked":"[[ \"$(omarchy-default-browser)\" == \"zen\" ]]","action":"omarchy-default-browser zen"}, diff --git a/migrations/1784510887.sh b/migrations/1784510887.sh new file mode 100644 index 00000000..ded1eb84 --- /dev/null +++ b/migrations/1784510887.sh @@ -0,0 +1,16 @@ +echo "Switch Brave Origin from the beta to the stable release" + +if omarchy-pkg-present brave-origin-beta-bin; then + default_browser=$(xdg-settings get default-web-browser 2>/dev/null || true) + + omarchy-pkg-aur-add brave-origin-bin + omarchy-pkg-drop brave-origin-beta-bin + + mkdir -p ~/.config + cp -f "$OMARCHY_PATH/config/chromium-flags.conf" ~/.config/brave-origin-flags.conf + rm -f ~/.config/brave-origin-beta-flags.conf + + if [[ $default_browser == "brave-origin-beta.desktop" ]]; then + omarchy-default-browser brave-origin + fi +fi