Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Open-Wine-Components/umu-launcher
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6d85b42e1f06dabd7ebf4e2e0b74575697b01d2
Choose a base ref
..
head repository: Open-Wine-Components/umu-launcher
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 29a356eabd5075522de9003f7b73ff6bc76827cb
Choose a head ref
Showing with 15 additions and 14 deletions.
  1. +1 −1 packaging/snap/snap/snapcraft.yaml
  2. +14 −13 umu/umu_consts.py
2 changes: 1 addition & 1 deletion packaging/snap/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -288,7 +288,7 @@ parts:
apps:
umu-run:
command-chain: [snap/command-chain/alsa-launch, bin/desktop-launch]
command: /usr/bin/umu-run
command: usr/bin/umu-run
plugs:
- shmem
- desktop
27 changes: 14 additions & 13 deletions umu/umu_consts.py
Original file line number Diff line number Diff line change
@@ -32,19 +32,20 @@
# then $XDG_DATA_HOME as fallback, and will be required to update their
# manifests by adding the permission 'xdg-data/umu:create'.
# See https://github.com/Open-Wine-Components/umu-launcher/pull/229#discussion_r1799289068
match os.environ.get("container") == "flatpak": # noqa: SIM112
case True:
XDG_DATA_HOME: Path = (
Path(os.environ["HOST_XDG_DATA_HOME"])
if os.environ.get("HOST_XDG_DATA_HOME")
else Path.home().joinpath(".local", "share")
)
case False:
XDG_DATA_HOME: Path = (
Path(os.environ["XDG_DATA_HOME"])
if os.environ.get("XDG_DATA_HOME")
else Path.home().joinpath(".local", "share")
)
if os.environ.get("container") == "flatpak": # noqa: SIM112
XDG_DATA_HOME: Path = (
Path(os.environ["HOST_XDG_DATA_HOME"])
if os.environ.get("HOST_XDG_DATA_HOME")
else Path.home().joinpath(".local", "share")
)
elif os.environ.get("SNAP"):
XDG_DATA_HOME: Path = Path(os.environ["SNAP_REAL_HOME"])
else:
XDG_DATA_HOME: Path = (
Path(os.environ["XDG_DATA_HOME"])
if os.environ.get("XDG_DATA_HOME")
else Path.home().joinpath(".local", "share")
)

UMU_LOCAL: Path = XDG_DATA_HOME.joinpath("umu")