From 7d8499e36a93b39862918b91aa8f6883f8706988 Mon Sep 17 00:00:00 2001
From: Dan Bungert <daniel.bungert@canonical.com>
Date: Thu, 27 Jul 2023 14:38:52 -0600
Subject: [PATCH] snapcraft: fix probert, add curtin runners

Make it so that probert and curtin can be run from the snap.  Invoked as
subiquity.probert and subiquity.curtin respectively.
---
 bin/subiquity-cmd |  3 +--
 snapcraft.yaml    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/subiquity-cmd b/bin/subiquity-cmd
index 285c9340..c7d42c7e 100755
--- a/bin/subiquity-cmd
+++ b/bin/subiquity-cmd
@@ -1,4 +1,3 @@
 #!/bin/sh
-
 export PYTHONPATH=$PYTHONPATH:$SNAP/lib/python3.10/site-packages
-$PYTHON -m subiquity "$@"
+exec "$@"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c89fd335..ab268a6c 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -10,7 +10,7 @@ contact: https://bugs.launchpad.net/subiquity/+filebug
 
 apps:
   subiquity:
-    command: usr/bin/subiquity-cmd
+    command: usr/bin/subiquity-cmd $SNAP/usr/bin/python3.10 -m subiquity
     environment:
       # Save original values of environment variables, we want to restore them
       # for the debug shell (LP: #1975629) and restart (LP: #1978139)
@@ -23,7 +23,16 @@ apps:
       PYTHON_ORIG: $PYTHON
       PYTHON: $SNAP/usr/bin/python3.10
   probert:
-    command: bin/probert
+    command: usr/bin/subiquity-cmd $SNAP/usr/bin/python3.10 $SNAP/bin/probert
+    environment:
+      PYTHON: $SNAP/usr/bin/python3.10
+  curtin:
+    command: usr/bin/subiquity-cmd $SNAP/bin/curtin
+    environment:
+      PYTHONIOENCODING: utf-8
+      PYTHON: $SNAP/usr/bin/python3.10
+      PY3OR2_PYTHON: $SNAP/usr/bin/python3.10
+      PATH: $PATH:$SNAP/bin
   subiquity-server:
     command: usr/bin/subiquity-server
     daemon: simple