diff --git a/ryoku-shell-installer/CHANGELOG.md b/ryoku-shell-installer/CHANGELOG.md index 45d93f702..aa1d7b50d 100644 --- a/ryoku-shell-installer/CHANGELOG.md +++ b/ryoku-shell-installer/CHANGELOG.md @@ -2,6 +2,13 @@ ## Unreleased +### Fixed +- **Installing on Omarchy no longer stops at `mimeapps.list`.** Omarchy already + owns `/usr/share/applications/mimeapps.list`, which `ryoku-desktop` supplies + with Ryoku's vendor defaults. The Arch installer's `--overwrite` pattern now + includes that exact path, allowing pacman to adopt it during the package + transaction. Rebuilt the committed binary + checksum. + ### Fixed - **Converting a box that runs oh-my-zsh-git no longer dies at the desktop transaction.** ryoku-oh-my-zsh provides and replaces both upstream diff --git a/ryoku-shell-installer/distro_test.go b/ryoku-shell-installer/distro_test.go index 226f69626..dd896bbc1 100644 --- a/ryoku-shell-installer/distro_test.go +++ b/ryoku-shell-installer/distro_test.go @@ -104,6 +104,7 @@ func TestDesktopPacmanArgsAdoptsRyokuPaths(t *testing.T) { "/usr/bin/ryoku-dns", "/usr/share/polkit-1/rules.d/50-ryoku-dns.rules", "/usr/share/plymouth/themes/ryoku/bullet.png", + "/usr/share/applications/mimeapps.list", } { covered := false for _, g := range strings.Split(glob, ",") { diff --git a/ryoku-shell-installer/engine.go b/ryoku-shell-installer/engine.go index efc0a0396..626454194 100644 --- a/ryoku-shell-installer/engine.go +++ b/ryoku-shell-installer/engine.go @@ -51,7 +51,8 @@ var ryokuPkgs = []string{"ryoku-keyring", "ryoku-desktop"} // (updater.ryokuOverwriteGlob); keep the three in sync. const ryokuOverwriteGlob = "/usr/bin/ryoku-*," + "/usr/share/polkit-1/rules.d/*ryoku*.rules," + - "/usr/share/plymouth/themes/ryoku/*" + "/usr/share/plymouth/themes/ryoku/*," + + "/usr/share/applications/mimeapps.list" // bootChainSkip: base.packages entries a shell-converted box must NOT get -- it // already owns its bootloader, initramfs, encryption and snapshot stack, and diff --git a/ryoku-shell-installer/ryoku-shell-install b/ryoku-shell-installer/ryoku-shell-install index 6718a7815..1bce01fb9 100755 Binary files a/ryoku-shell-installer/ryoku-shell-install and b/ryoku-shell-installer/ryoku-shell-install differ diff --git a/ryoku-shell-installer/ryoku-shell-install.sha256 b/ryoku-shell-installer/ryoku-shell-install.sha256 index 87456893f..61f382a8e 100644 --- a/ryoku-shell-installer/ryoku-shell-install.sha256 +++ b/ryoku-shell-installer/ryoku-shell-install.sha256 @@ -1 +1 @@ -058a7adfad996c6845ddaa753c702ec20cab84b39717c95b2f9ea671dd213e53 ryoku-shell-install +f7a7b157004bb812f37649885f96f0f43c9d573485fe702155404a2a6c24b1c7 ryoku-shell-install