From accf6aebc69258e6a6c3d5000a4dd27d014aab7a Mon Sep 17 00:00:00 2001
From: TheBrokenRail <connor24nolan@live.com>
Date: Sun, 22 Nov 2020 17:30:06 -0500
Subject: [PATCH] Improve Script

---
 debian/client/common/usr/bin/minecraft-pi     | 36 +++++++++----------
 .../client/virgl/usr/lib/minecraft-pi/run.sh  |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/debian/client/common/usr/bin/minecraft-pi b/debian/client/common/usr/bin/minecraft-pi
index de5a47cc5..0008a660b 100755
--- a/debian/client/common/usr/bin/minecraft-pi
+++ b/debian/client/common/usr/bin/minecraft-pi
@@ -3,25 +3,23 @@
 set -e
 
 # Ensure Features Are Selected
-if [ -z "${MCPI_SUBSHELL}" ]; then
-    MCPI_FEATURES="$(zenity --class 'Minecraft - Pi edition' --list --checklist --column 'Enabled' --column 'Feature' \
-        TRUE 'Touch GUI' \
-        FALSE 'Survival Mode' \
-        TRUE 'Fix Bow & Arrow' \
-        TRUE 'Fix Attacking' \
-        TRUE 'Mob Spawning' \
-        TRUE 'Fancy Graphics' \
-        TRUE 'Disable Autojump By Default' \
-        TRUE 'Fix Sign Placement' \
-        TRUE 'Show Block Outlines' \
-        FALSE 'Expand Creative Inventory' \
-        FALSE 'Peaceful Mode' \
-        TRUE 'Animated Water' \
-        TRUE 'Remove Invalid Item Background' \
-        TRUE 'Smooth Lighting' \
-        FALSE '3D Anaglyph')"
-    MCPI_USERNAME="$(zenity --class 'Minecraft - Pi edition' --entry --text 'Minecraft Username:' --entry-text 'StevePi')"
-fi
+MCPI_FEATURES="$(zenity --class 'Minecraft - Pi edition' --list --checklist --column 'Enabled' --column 'Feature' \
+    TRUE 'Touch GUI' \
+    FALSE 'Survival Mode' \
+    TRUE 'Fix Bow & Arrow' \
+    TRUE 'Fix Attacking' \
+    TRUE 'Mob Spawning' \
+    TRUE 'Fancy Graphics' \
+    TRUE 'Disable Autojump By Default' \
+    TRUE 'Fix Sign Placement' \
+    TRUE 'Show Block Outlines' \
+    FALSE 'Expand Creative Inventory' \
+    FALSE 'Peaceful Mode' \
+    TRUE 'Animated Water' \
+    TRUE 'Remove Invalid Item Background' \
+    TRUE 'Smooth Lighting' \
+    FALSE '3D Anaglyph')"
+MCPI_USERNAME="$(zenity --class 'Minecraft - Pi edition' --entry --text 'Minecraft Username:' --entry-text 'StevePi')"
 export MCPI_FEATURES
 export MCPI_USERNAME
 
diff --git a/debian/client/virgl/usr/lib/minecraft-pi/run.sh b/debian/client/virgl/usr/lib/minecraft-pi/run.sh
index ccf0a75fe..13860a688 100755
--- a/debian/client/virgl/usr/lib/minecraft-pi/run.sh
+++ b/debian/client/virgl/usr/lib/minecraft-pi/run.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Start VirGL
-virgl_test_server &
+virgl_test_server & &> /tmp/virgl.log
 VIRGL_PID="$!"
 
 # Launch Minecraft