From 8c4f5872f8bd9e2ed5f6b109bd744e9e6e589e60 Mon Sep 17 00:00:00 2001
From: Percs <83934299+Percslol@users.noreply.github.com>
Date: Sat, 7 Sep 2024 10:54:31 -0500
Subject: [PATCH] update submodules and get rid of twisp

---
 .gitmodules                                 | 3 ---
 Makefile                                    | 2 +-
 dreamlandjs                                 | 2 +-
 x86_image_wizard/alpine/build-alpine-bin.sh | 7 -------
 x86_image_wizard/epoxy                      | 2 +-
 x86_image_wizard/twisp                      | 1 -
 x86_image_wizard/x86_image_wizard.sh        | 8 ++++++++
 7 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 160000 x86_image_wizard/twisp

diff --git a/.gitmodules b/.gitmodules
index 52a7b3fb..cd8f4e5f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "dreamlandjs"]
 	path = dreamlandjs
 	url = https://github.com/mercuryworkshop/dreamlandjs
-[submodule "x86_image_wizard/twisp"]
-	path = x86_image_wizard/twisp
-	url = https://github.com/MercuryWorkshop/twisp.git
 [submodule "chimerix"]
 	path = chimerix
 	url = https://github.com/MercuryWorkshop/chimerix.git
diff --git a/Makefile b/Makefile
index 9ff401d7..f56393da 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ hooks: FORCE
 	chmod +x .git/hooks/pre-commit
 
 submodules: .gitmodules
-	git submodule update
+#	git submodule update
 
 # Each dependency should have a similar structure to the following:
 #   build/libs/<libname>/<bundle>.min.js
diff --git a/dreamlandjs b/dreamlandjs
index 108d3033..53cf82e5 160000
--- a/dreamlandjs
+++ b/dreamlandjs
@@ -1 +1 @@
-Subproject commit 108d3033da31832f428a003520f1f116346edd0e
+Subproject commit 53cf82e5d2f18194981c9a819e26c6c4f852f642
diff --git a/x86_image_wizard/alpine/build-alpine-bin.sh b/x86_image_wizard/alpine/build-alpine-bin.sh
index 3b8103cc..4b8e5593 100755
--- a/x86_image_wizard/alpine/build-alpine-bin.sh
+++ b/x86_image_wizard/alpine/build-alpine-bin.sh
@@ -1,13 +1,6 @@
 #!/usr/bin/env bash
 set -veu
 
-if [ -w /var/run/docker.sock ]
-then
-    echo true
-else 
-    echo "You aren't in the docker group, please run usermod -a -G docker $USER && newgrp docker"
-    exit 2
-fi
 # good for debugging
 pause() {
     while read -r -t 0.001; do :; done
diff --git a/x86_image_wizard/epoxy b/x86_image_wizard/epoxy
index 23b96c20..d6c095fe 160000
--- a/x86_image_wizard/epoxy
+++ b/x86_image_wizard/epoxy
@@ -1 +1 @@
-Subproject commit 23b96c2073f463ca4c05e172e358412c4d409a63
+Subproject commit d6c095fe7bfa7992ef21adb420c1aacb0e0cf9fc
diff --git a/x86_image_wizard/twisp b/x86_image_wizard/twisp
deleted file mode 160000
index ae6e6527..00000000
--- a/x86_image_wizard/twisp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae6e6527d79c5206c305f27658ff16a6d2840748
diff --git a/x86_image_wizard/x86_image_wizard.sh b/x86_image_wizard/x86_image_wizard.sh
index 45ee87b9..877306b5 100644
--- a/x86_image_wizard/x86_image_wizard.sh
+++ b/x86_image_wizard/x86_image_wizard.sh
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+if [ -w /var/run/docker.sock ]
+then
+    true
+else 
+    echo "You aren't in the docker group, please run usermod -a -G docker $USER && newgrp docker"
+    exit 2
+fi
+
 build_alpine() {
     cd alpine
     sh build-alpine-bin.sh