Add Back sg/pkexec Code

README.md

@@ -39,12 +39,7 @@ Minecraft: Pi Edition Modding Project
 Game logs are located in ``/tmp/minecraft-pi``.
 
 ### ``Couldn't connect to Docker daemon at http+docker://localhost - is it running?``
-- Make Sure Your User Is In The ``docker`` Group
+Make Sure Docker Is Running:
-  ```sh
-  sudo usermod -aG docker "$(id -un)"
-  ```
-  Then Log Out And Log Back In
-- Make Sure Docker Is Running
 ```sh
 sudo service docker start
 ```

debian/client/common/usr/bin/minecraft-pi

@@ -2,6 +2,11 @@
 
 set -e
 
+# Esnure User Is In docker Group
+if ! id -nGz | grep -qzxF 'docker'; then
+    pkexec /usr/sbin/usermod -aG docker "$(id -un)"
+fi
+
 # All Feature Flags
 export AVAILABLE_FEATURES="$(tr '\n' ' ' < /usr/share/minecraft-pi/client/features)"
 
@@ -34,7 +39,7 @@ export USER_UID="$(id -u)"
 
 # Run
 set +e
-/usr/lib/minecraft-pi/pre-launch.sh
+sg docker /usr/lib/minecraft-pi/pre-launch.sh
 RET=$?
 set -e
 

scripts/package.sh

@@ -6,8 +6,8 @@ DEB_VERSION='1.0.0'
 # Dependencies
 REQUIRED_DOCKER_VERSION='19.03'
 COMMON_DEPENDENCIES="docker.io (>=${REQUIRED_DOCKER_VERSION}) | docker-ce (>=${REQUIRED_DOCKER_VERSION}), libseccomp2 (>=2.4.2), docker-compose, binfmt-support"
-CLIENT_DEPENDENCIES="zenity, x11-xserver-utils"
+CLIENT_DEPENDENCIES='zenity, x11-xserver-utils, login, policykit-1, passwd'
-RECOMMENDED_DEPENDENCIES="qemu-user-static"
+RECOMMENDED_DEPENDENCIES='qemu-user-static'
 
 set -e