From 78fc29621c7f15c295271501356b5c79e588d2d9 Mon Sep 17 00:00:00 2001
From: CyberLord09 <anvay.vahia@gmail.com>
Date: Thu, 18 Sep 2025 09:54:24 -0700
Subject: [PATCH 1/2] slack version update

---
 .../src/ubuntu/install/slack/install_slack.sh | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/workspace/shared/src/ubuntu/install/slack/install_slack.sh b/workspace/shared/src/ubuntu/install/slack/install_slack.sh
index aa9d8f2..a4209ff 100644
--- a/workspace/shared/src/ubuntu/install/slack/install_slack.sh
+++ b/workspace/shared/src/ubuntu/install/slack/install_slack.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -ex
+
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
 
 if [ "${ARCH}" == "arm64" ] ; then
@@ -7,15 +8,20 @@ if [ "${ARCH}" == "arm64" ] ; then
     exit 0
 fi
 
-version=4.12.2
-
-wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb
-apt-get update
+# Fetch the version number from Slack release notes page
+version=$(curl -sL "https://slack.com/release-notes/linux" \
+    | grep -oP '(?<=Slack )\d+(\.\d+)+(?= has been released for Linux)' \
+    | head -1)
 
-# 👇 FIX: allow downgrades
-apt-get install -y --allow-downgrades ./slack-desktop-${version}-${ARCH}.deb
+# Fallback if parsing fails
+if [ -z "$version" ]; then
+    version=4.46.96
+fi
 
-rm slack-desktop-${version}-${ARCH}.deb
+wget -q "https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb"
+apt-get update
+apt-get install -y --allow-downgrades "./slack-desktop-${version}-${ARCH}.deb"
+rm "./slack-desktop-${version}-${ARCH}.deb"
 sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop
 cp /usr/share/applications/slack.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/slack.desktop

From f1a229dff28a081aca730c0848c4fe13b0542e85 Mon Sep 17 00:00:00 2001
From: vibha1019 <vibhamandayam08@gmail.com>
Date: Sun, 21 Sep 2025 19:53:28 -0700
Subject: [PATCH 2/2] fix slack script

---
 workspace/kali/Dockerfile                     |  9 ++++--
 workspace/noble/Dockerfile                    |  8 +++--
 .../src/ubuntu/install/slack/install_slack.sh | 31 +++++++++----------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/workspace/kali/Dockerfile b/workspace/kali/Dockerfile
index 2da3f89..ccc1acc 100644
--- a/workspace/kali/Dockerfile
+++ b/workspace/kali/Dockerfile
@@ -50,16 +50,19 @@ COPY shared/src/ubuntu/install/common_env/install_system_bash.sh /usr/bin/
 COPY shared/src/ubuntu/install/common_env/configure_user_bash.sh /usr/bin/
 
 # Run installations
-RUN \
+RUN set -x && \
   for SCRIPT in $INST_SCRIPTS; do \
+    echo "Running $SCRIPT"; \
     bash ${INST_DIR}${SCRIPT} || exit 1; \
   done && \
-  $STARTUPDIR/set_user_permission.sh $HOME && \
-  rm -f /etc/X11/xinit/Xclients && \
+  ls -l $STARTUPDIR && \
+  ls -l /usr/bin/configure_user_bash.sh || true && \
+  echo "HOME=$HOME" && \
   chown 1000:0 $HOME && \
   /usr/bin/configure_user_bash.sh && \
   rm -Rf ${INST_DIR}
 
+
 ########## End Customizations ###########
 
 # Userspace Runtime
diff --git a/workspace/noble/Dockerfile b/workspace/noble/Dockerfile
index 72dea2e..8e4539e 100644
--- a/workspace/noble/Dockerfile
+++ b/workspace/noble/Dockerfile
@@ -53,12 +53,14 @@ COPY shared/src/ubuntu/install/common_env/install_ruby_gems.sh /usr/bin/
 COPY shared/src/ubuntu/install/common_env/install_system_bash.sh /usr/bin/
 COPY shared/src/ubuntu/install/common_env/configure_user_bash.sh /usr/bin/
 # Run installations
-RUN \
+RUN set -x && \
   for SCRIPT in $INST_SCRIPTS; do \
+    echo "Running $SCRIPT"; \
     bash ${INST_DIR}${SCRIPT} || exit 1; \
   done && \
-  $STARTUPDIR/set_user_permission.sh $HOME && \
-  rm -f /etc/X11/xinit/Xclients && \
+  ls -l $STARTUPDIR && \
+  ls -l /usr/bin/configure_user_bash.sh || true && \
+  echo "HOME=$HOME" && \
   chown 1000:0 $HOME && \
   /usr/bin/configure_user_bash.sh && \
   rm -Rf ${INST_DIR}
diff --git a/workspace/shared/src/ubuntu/install/slack/install_slack.sh b/workspace/shared/src/ubuntu/install/slack/install_slack.sh
index a4209ff..2da437c 100644
--- a/workspace/shared/src/ubuntu/install/slack/install_slack.sh
+++ b/workspace/shared/src/ubuntu/install/slack/install_slack.sh
@@ -1,28 +1,27 @@
 #!/usr/bin/env bash
 set -ex
-
 ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
-
 if [ "${ARCH}" == "arm64" ] ; then
     echo "Slack for arm64 currently not supported, skipping install"
     exit 0
 fi
-
-# Fetch the version number from Slack release notes page
-version=$(curl -sL "https://slack.com/release-notes/linux" \
-    | grep -oP '(?<=Slack )\d+(\.\d+)+(?= has been released for Linux)' \
-    | head -1)
-
-# Fallback if parsing fails
-if [ -z "$version" ]; then
-    version=4.46.96
-fi
-
-wget -q "https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb"
+version=4.38.125
+wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb
 apt-get update
-apt-get install -y --allow-downgrades "./slack-desktop-${version}-${ARCH}.deb"
-rm "./slack-desktop-${version}-${ARCH}.deb"
+# 👇 FIX for Kali: install missing dependency if needed
+apt-get install -y libappindicator3-1 || true
+# 👇 FIX: allow downgrades
+apt-get install -y --allow-downgrades ./slack-desktop-${version}-${ARCH}.deb
+rm slack-desktop-${version}-${ARCH}.deb
 sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop
 cp /usr/share/applications/slack.desktop $HOME/Desktop/
 chmod +x $HOME/Desktop/slack.desktop
 chown 1000:1000 $HOME/Desktop/slack.desktop
+
+# Test that slack --version works
+echo "Testing Slack installation..."
+if slack --version; then
+    echo "✅ Slack installed successfully and version command works"
+else
+    echo "❌ Slack version command failed, but package should be installed"
+fi
\ No newline at end of file