Skip to content

[installation] installer: adopt Omarchy mimeapps.list #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eduardoaugustolb wants to merge 1 commit into from
Closed

[installation] installer: adopt Omarchy mimeapps.list #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ryoku-shell-installer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ryoku-shell-installer/distro_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ",") {
Expand Down
3 changes: 2 additions & 1 deletion ryoku-shell-installer/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified ryoku-shell-installer/ryoku-shell-install
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ryoku-shell-installer/ryoku-shell-install.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
058a7adfad996c6845ddaa753c702ec20cab84b39717c95b2f9ea671dd213e53 ryoku-shell-install
f7a7b157004bb812f37649885f96f0f43c9d573485fe702155404a2a6c24b1c7 ryoku-shell-install
Loading