lwoodard/Omarchy-Stream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up sunshine-bin-debug too when falling back to source build

Browse Source 
When sunshine-bin trips the ldd check and we switch to the source build,
the prior install left sunshine-bin-debug behind. The source package
includes its own sunshine-debug which collides on
/usr/lib/debug/usr/bin/sunshine.debug, so pacman refuses the install.

Remove both sunshine-bin and sunshine-bin-debug before yay -S sunshine.
uninstall.sh similarly drops all four variants.
This commit is contained in:
Levi Woodard
2026-05-18 11:07:59 -06:00
parent 2f242ffb61
commit e18187362c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/packages.sh
View File

@@ -35,7 +35,14 @@ install_sunshine() {
warn "sunshine-bin has unresolved shared library deps (rolling-Arch library drift)." warn "sunshine-bin has unresolved shared library deps (rolling-Arch library drift)."
warn "Falling back to the source build (AUR 'sunshine'). This takes ~5-10 minutes." warn "Falling back to the source build (AUR 'sunshine'). This takes ~5-10 minutes."
ldd "$(command -v sunshine)" 2>/dev/null | grep 'not found' | sed 's/^/ /' >&2 || true ldd "$(command -v sunshine)" 2>/dev/null | grep 'not found' | sed 's/^/ /' >&2 || true
as_root pacman -Rns --noconfirm sunshine-bin # Remove both sunshine-bin AND its sibling sunshine-bin-debug, otherwise
# the source build's sunshine-debug package collides on
# /usr/lib/debug/usr/bin/sunshine.debug.
for stale in sunshine-bin-debug sunshine-bin; do
if pacman -Qi "$stale" >/dev/null 2>&1; then
as_root pacman -Rns --noconfirm "$stale"
fi
done
SUNSHINE_PKG="sunshine" SUNSHINE_PKG="sunshine"
yay_install sunshine yay_install sunshine
if ! sunshine_runtime_deps_ok; then if ! sunshine_runtime_deps_ok; then

3
uninstall.sh
View File

@@ -42,7 +42,8 @@ if loginctl show-user "$USER" -p Linger --value 2>/dev/null | grep -qx yes; then
fi fi
step "Removing packages" step "Removing packages"
for pkg in sunshine sunshine-bin; do # Remove -debug siblings first so they don't collide with re-installation later.
for pkg in sunshine-debug sunshine-bin-debug sunshine sunshine-bin; do
if pacman -Qi "$pkg" >/dev/null 2>&1; then if pacman -Qi "$pkg" >/dev/null 2>&1; then
as_root pacman -Rns --noconfirm "$pkg" as_root pacman -Rns --noconfirm "$pkg"
fi fi