Merge pull request #407 from canonical/streamline-snap-package

Fix snap XDG environment variables
canonical · Nov 19, 2024 · 35d4122 · 35d4122
2 parents 539d441 + 6f3fb89
commit 35d4122
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ docs/.sphinx/.doctrees/
 
 _build
 __pycache__
+
+*.snap
diff --git a/cli/snapcraft.yaml b/cli/snapcraft.yaml
@@ -21,7 +21,14 @@ architectures:
 
 apps:
   testflinger-cli:
-    command: bin/testflinger-cli.wrapper
+    command: testflinger-cli
+    environment:
+      LC_ALL: C.UTF-8
+      LANG: C.UTF-8
+      XDG_DATA_HOME: $SNAP_USER_DATA/.local/share
+      XDG_CONFIG_HOME: $SNAP_USER_DATA/.config
+      XDG_CACHE_HOME: $SNAP_USER_DATA/.cache
+      XDG_STATE_HOME: $SNAP_USER_DATA/.local/state
     plugs:
       - home
       - network
@@ -30,8 +37,7 @@ parts:
   launcher:
     plugin: dump
     source: .
-    organize:
-      testflinger-cli.wrapper: bin/testflinger-cli.wrapper
+
   testflinger-cli:
     plugin: python
     source: .

diff --git a/cli/testflinger-cli.wrapper b/cli/testflinger-cli.wrapper
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ docs/.sphinx/.doctrees/

		_build
		__pycache__

		*.snap