From ee015e6594471d621a6f2cc69efa40ee21e69c8a Mon Sep 17 00:00:00 2001
From: SkyperTHC <skyper@thc.org>
Date: Fri, 6 Jan 2023 11:57:14 +0000
Subject: [PATCH] xorg2

---
 guest/Dockerfile                    | 12 +++++++++---
 guest/fs-root/sf/bin/pkg-install.sh |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/guest/Dockerfile b/guest/Dockerfile
index 29db5bb..0cc38d6 100644
--- a/guest/Dockerfile
+++ b/guest/Dockerfile
@@ -3,7 +3,7 @@ FROM kalilinux/kali-rolling
 WORKDIR /root/
 
 # Valid options are:
-#   MINI BASE DEVEL NET WEB HACK LARGE HUGE ALL
+#   MINI BASE DEVEL NET WEB HACK LARGE HUGE GUI ALL
 #   SF_PACKAGES=ALL make
 # Default is "MINI BASE NET" (see pkg-install.sh)
 ARG SF_PACKAGES
@@ -97,7 +97,7 @@ RUN	sed 's/^deb \(.*\)/deb \1\ndeb-src \1/g' -i /etc/apt/sources.list \
 		wireguard-tools \
 		wget \
 		whois \
-	&& DEBIAN_FRONTEND=noninteractive /pkg-install.sh HACK apt-get install -y --no-install-recommends \
+	&& /pkg-install.sh HACK apt-get install -y --no-install-recommends \
 		assetfinder \
 		dnsmap \
 		dnsx \
@@ -227,7 +227,7 @@ RUN	sed 's/^deb \(.*\)/deb \1\ndeb-src \1/g' -i /etc/apt/sources.list \
 		wpscan \
 		wrk \
 		xdg-utils \
-		xorg xfce4 xfce4-goodies dbus-x11 x11-xserver-utils xrdp \
+		xfce4 xfce4-goodies dbus-x11 x11-xserver-utils \
 		xmlstarlet \
 		xsltproc \
 		xvfb \
@@ -251,6 +251,11 @@ RUN	sed 's/^deb \(.*\)/deb \1\ndeb-src \1/g' -i /etc/apt/sources.list \
 		rubygems \
 		veil \
 		x11-apps \
+	&& /pkg-install.sh GUI apt-get install -y --no-install-recommends \
+		fluxbox \
+		x11vnc \
+		xorg \
+		xrdp \
 	&& /pkg-install.sh HUGE ghbin SagerNet/sing-box 'linux-amd64.' sing-box \
 	&& /pkg-install.sh HUGE ghbin tomnomnom/waybackurls 'linux-amd64-' waybackurls \
 	&& /pkg-install.sh HACK ghbin projectdiscovery/uncover 'linux_amd64.zip$' uncover \
@@ -266,6 +271,7 @@ RUN	sed 's/^deb \(.*\)/deb \1\ndeb-src \1/g' -i /etc/apt/sources.list \
 	&& /pkg-install.sh LARGE ghbin cloudflare/cloudflared 'linux-amd64.deb$' \
 	&& /pkg-install.sh LARGE ghbin cheat/cheat 'linux-amd64.gz$' cheat \
 	&& /pkg-install.sh LARGE ghbin sensepost/gowitness 'linux-amd64$' gowitness \
+	&& /pkg-install.sh MINI ghbin t3rm1n4l/megacmd 'linux_amd64.zip$' megacmd \
 	&& /pkg-install.sh HACK ghbin ropnop/kerbrute 'linux_amd64$' kerbrute \
 	&&/ pkg-install.sh HACK ghbin hmgle/graftcp '_amd64.deb$' \
 	&& /pkg-install.sh LARGE ghbin denisidoro/navi 'x86_64-unknown-linux' navi \
diff --git a/guest/fs-root/sf/bin/pkg-install.sh b/guest/fs-root/sf/bin/pkg-install.sh
index 189f98c..e539f1e 100755
--- a/guest/fs-root/sf/bin/pkg-install.sh
+++ b/guest/fs-root/sf/bin/pkg-install.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+export DEBIAN_FRONTEND=noninteractive
+
 # Install latest Binary from GitHub and smear it into /usr/bin
 # [<user>/<repo>] [<regex-match>] [asset]
 # Examples: