update submodules and get rid of twisp

MercuryWorkshop · Sep 7, 2024 · 8c4f587 · 8c4f587
1 parent 8ba1874
commit 8c4f587
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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
diff --git 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
diff --git a/x86_image_wizard/twisp b/x86_image_wizard/twisp
diff --git 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
+5 −3		client/.npmignore
+1 −1		client/package.json
+46 −29		client/src/lib.rs
+18 −11		client/src/websocket.rs
+2 −2		server/flamegraph.svg
+11 −4		server/src/config.rs
+55 −42		wisp/src/inner.rs
+3 −0		wisp/src/lib.rs
+4 −1		wisp/src/stream.rs