Skip to content

Keep existing wine when installing Lutris #11364

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

Open
Bartok9 wants to merge 1 commit into
base: quattro
Choose a base branch
from
+28 −1
Open

Keep existing wine when installing Lutris #11364

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
11 changes: 10 additions & 1 deletion bin/omarchy-install-gaming-lutris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
set -e

echo "Installing Lutris..."
omarchy-pkg-add lutris umu-launcher wine-staging wine-mono wine-gecko winetricks python-protobuf

# wine-staging conflicts with wine. If wine is already installed, keep it
# and still install Lutris plus the rest of the stack. Replacing wine is a
# decision for the person at the machine, not a silent --noconfirm swap.
wine_pkg=wine-staging
if pacman -Qq wine >/dev/null 2>&1 && ! pacman -Qq wine-staging >/dev/null 2>&1; then
wine_pkg=wine
fi

omarchy-pkg-add lutris umu-launcher "$wine_pkg" wine-mono wine-gecko winetricks python-protobuf
omarchy-install-gaming-gpu-lib32

# Lutris ships with `#!/usr/bin/env python3`, which resolves to mise's Python and
Expand Down
18 changes: 18 additions & 0 deletions test/shell.d/lutris-wine-conflict-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash

set -euo pipefail

source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"

install_script="$ROOT/bin/omarchy-install-gaming-lutris"

grep -F 'wine-staging' "$install_script" >/dev/null ||
fail "Lutris installer still prefers wine-staging when wine is not already installed"

grep -F 'pacman -Qq wine' "$install_script" >/dev/null ||
fail "Lutris installer does not detect an existing wine package before adding wine-staging"

grep -F 'wine_pkg=wine' "$install_script" >/dev/null ||
fail "Lutris installer does not keep existing wine instead of conflicting with wine-staging"

pass "Lutris installer keeps existing wine instead of conflicting with wine-staging"