set environment variables in snapcraft.yaml not wrappers

bin/subiquity-server

@@ -1,5 +0,0 @@
-#!/bin/sh
-# the backend part of subiquity
-export PYTHON=$SNAP/usr/bin/python3
-export SUBIQUITY_ROOT=$SNAP
-$PYTHON -m subiquity.cmd.server

bin/subiquity-service

@@ -1,11 +1,9 @@
 #!/bin/sh
-# the frontend part of subiquity
 port=tty1
 if [ -n "$1" ]; then
    port=$1
 fi
 /bin/dmesg -n 1
-export SUBIQUITY_ROOT=$SNAP
 if [ "$port" = "tty1" ]; then
 	$SNAP/bin/subiquity-loadkeys
 	setfont $SNAP/subiquity.psf

setup.py

@@ -111,10 +111,10 @@ setup(name='subiquity',
           'bin/subiquity-configure-apt',
           'bin/subiquity-loadkeys',
           'bin/subiquity-service',
-          'bin/subiquity-server',
       ],
       entry_points={
           'console_scripts': [
+              'subiquity-server = subiquity.cmd.server:main',
               'subiquity-tui = subiquity.cmd.tui:main',
               'console-conf-tui = console_conf.cmd.tui:main',
               ('console-conf-write-login-details = '

snapcraft.yaml

@@ -10,6 +10,7 @@ apps:
     command: usr/bin/subiquity
     environment:
       PYTHONIOENCODING: utf-8
+      SUBIQUITY_ROOT: $SNAP
   probert:
     command: bin/probert
   subiquity-server:
@@ -18,12 +19,15 @@ apps:
     restart-condition: always
     environment:
       PYTHONIOENCODING: utf-8
+      SUBIQUITY_ROOT: $SNAP
+      PYTHON: $SNAP/usr/bin/python3
   subiquity-service:
     command: usr/bin/subiquity-service
     daemon: simple
     restart-condition: always
     environment:
       PYTHONIOENCODING: utf-8
+      SUBIQUITY_ROOT: $SNAP
 
 parts:
   curtin: