Update DEB
This commit is contained in:
parent
c70199b355
commit
adb9d7b08e
4
debian/client/DEBIAN/control
vendored
4
debian/client/DEBIAN/control
vendored
@ -3,5 +3,5 @@ Version: 1.0.0
|
||||
Maintainer: TheBrokenRail <connor24nolan@live.com>
|
||||
Description: Fun with Blocks
|
||||
Homepage: https://www.minecraft.net/en-us/edition/pi
|
||||
Architecture: amd64
|
||||
Depends: docker.io, docker-compose, virgl-server, zenity, policykit-1, adduser, login
|
||||
Architecture: all
|
||||
Depends: docker.io, docker-compose, virgl-server, zenity, policykit-1, passwd, login, qemu-user-static, binfmt-support
|
||||
|
2
debian/client/DEBIAN/postinst
vendored
2
debian/client/DEBIAN/postinst
vendored
@ -2,6 +2,4 @@
|
||||
|
||||
set -e
|
||||
|
||||
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
|
||||
|
||||
MCPI_FEATURES='' MCPI_USERNAME='' docker-compose -f /usr/share/minecraft-pi/client/docker-compose.yml pull
|
||||
|
5
debian/client/usr/bin/minecraft-pi
vendored
5
debian/client/usr/bin/minecraft-pi
vendored
@ -17,12 +17,7 @@ VIRGL_PID="$!"
|
||||
# Ensure Groups Are Correct
|
||||
if [ -z "${MCPI_SUBSHELL}" ]; then
|
||||
if ! id -Gn "$(whoami)" | grep '\bdocker\b' > /dev/null; then
|
||||
if ! command -v adduser &> /dev/null
|
||||
then
|
||||
pkexec usermod -aG "$(whoami)" docker
|
||||
else
|
||||
pkexec adduser "$(whoami)" docker
|
||||
fi
|
||||
fi
|
||||
exec sg docker "env MCPI_SUBSHELL=1 \"$(realpath -e "$0")\""
|
||||
fi
|
||||
|
4
debian/server/DEBIAN/control
vendored
4
debian/server/DEBIAN/control
vendored
@ -3,5 +3,5 @@ Version: 1.0.0
|
||||
Maintainer: TheBrokenRail <connor24nolan@live.com>
|
||||
Description: Fun with Blocks
|
||||
Homepage: https://www.minecraft.net/en-us/edition/pi
|
||||
Architecture: amd64
|
||||
Depends: docker.io, docker-compose
|
||||
Architecture: all
|
||||
Depends: docker.io, docker-compose, qemu-user-static, binfmt-support
|
||||
|
2
debian/server/DEBIAN/postinst
vendored
2
debian/server/DEBIAN/postinst
vendored
@ -2,6 +2,4 @@
|
||||
|
||||
set -e
|
||||
|
||||
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
|
||||
|
||||
MCPI_ROOT='' docker-compose -f /usr/share/minecraft-pi/server/docker-compose.yml pull
|
||||
|
@ -21,5 +21,7 @@ cp -r mods/include out/lib/include
|
||||
|
||||
# Copy Shared Library
|
||||
IMG_ID="$(docker create thebrokenrail/minecraft-pi:client)"
|
||||
docker cp "${IMG_ID}":/app/minecraft-pi/mods/. ./out/lib/.
|
||||
docker cp "${IMG_ID}":/app/minecraft-pi/mods/. ./out/lib/. || :
|
||||
RET="$?"
|
||||
docker rm -v "${IMG_ID}"
|
||||
exit "${RET}"
|
||||
|
Loading…
Reference in New Issue
Block a user