diff --git a/bin/omarchy-default-browser b/bin/omarchy-default-browser index b6bbf8cbcfd..a771e61a9b1 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 ed067d8dddb..050ced20ec0 100755 --- a/bin/omarchy-install-browser +++ b/bin/omarchy-install-browser @@ -61,12 +61,12 @@ 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=~/.local/share/omarchy/default/chromium/extensions/copy-url" > ~/.config/brave-origin-beta-flags.conf + echo "--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url" > ~/.config/brave-origin-flags.conf omarchy-theme-set-browser announce_browser_installed "Brave Origin" ;; diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 8627ab132c3..14c040eea05 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -400,7 +400,7 @@ show_setup_default_browser_menu() { browser_desktop_exists chromium.desktop && options="$options Chromium" browser_desktop_exists google-chrome.desktop && options="${options:+$options\n}󰊯 Chrome" browser_desktop_exists brave-browser.desktop && options="${options:+$options\n}󰖟 Brave" - browser_desktop_exists brave-origin-beta.desktop && options="${options:+$options\n}󰖟 Brave Origin" + browser_desktop_exists brave-origin.desktop && options="${options:+$options\n}󰖟 Brave Origin" browser_desktop_exists microsoft-edge.desktop && options="${options:+$options\n}󰇩 Edge" browser_desktop_exists firefox.desktop && options="${options:+$options\n}󰈹 Firefox" browser_desktop_exists zen.desktop && options="${options:+$options\n}󰖟 Zen" diff --git a/bin/omarchy-remove-browser b/bin/omarchy-remove-browser index 6ae076dfb52..b0bc7659c39 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 ee189d17bb4..cd88e2902c6 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/migrations/1779745014.sh b/migrations/1779745014.sh new file mode 100644 index 00000000000..96003c5b930 --- /dev/null +++ b/migrations/1779745014.sh @@ -0,0 +1,8 @@ +echo "Remove old Brave Origin Beta flags file and symlink Brave Origin flags to brave-flags.conf" + +mkdir -p ~/.config +rm -f ~/.config/brave-origin-beta-flags.conf + +if [[ -e ~/.config/brave-flags.conf ]]; then + ln -sf ~/.config/brave-flags.conf ~/.config/brave-origin-flags.conf +fi