From 6e1c77813ceb67e7efa4518837acc46a6b9d2e7e Mon Sep 17 00:00:00 2001
From: Tobias Kessels <tobias.kessels@certbw.de>
Date: Wed, 1 Oct 2025 15:24:46 +0200
Subject: [PATCH] Fix zsh alias error and sync packages across Dockerfiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed zsh configuration:
- Fixed '?' alias that was causing 'no matches found' error in zsh
- Added proper bat alias (bat → batcat on Ubuntu)
- Added conditional alias handling for different shells

Synchronized packages across Dockerfiles:
- Added bat, mpack, pandoc to Dockerfile.scratch
- Enhanced package cleanup in Dockerfile.scratch
- Both Dockerfiles now have identical package lists

New packages available:
- bat (as batcat) - syntax-highlighted cat alternative
- mpack - MIME email utilities
- pandoc - document converter

All shells (bash, zsh, fish) now work without errors!
---
 Dockerfile         | 3 +++
 Dockerfile.scratch | 5 ++++-
 files/zshrc        | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fdaa158..a1d6dae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ENV TZ=Europe/Berlin
 # Install additional system packages that REMnux doesn't include
 RUN apt-get update && apt-get install -y \
     busybox \
+    bat \
     catdoc \
     docx2txt \
     fd-find \
@@ -17,6 +18,8 @@ RUN apt-get update && apt-get install -y \
     pipx \
     ripgrep \
     unrtf \
+    mpack \
+    pandoc \
     zsh \
     zsh-autosuggestions \
     zsh-syntax-highlighting \
diff --git a/Dockerfile.scratch b/Dockerfile.scratch
index 45e16a1..6a39a67 100644
--- a/Dockerfile.scratch
+++ b/Dockerfile.scratch
@@ -31,6 +31,7 @@ ENV TZ=Europe/Berlin
 # Install additional system packages that REMnux doesn't include
 RUN apt-get update && apt-get install -y \
     busybox \
+    bat \
     catdoc \
     docx2txt \
     fd-find \
@@ -40,10 +41,12 @@ RUN apt-get update && apt-get install -y \
     pipx \
     ripgrep \
     unrtf \
+    mpack \
+    pandoc \
     zsh \
     zsh-autosuggestions \
     zsh-syntax-highlighting \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Configure pip  
 ENV PYTHONDONTWRITEBYTECODE=1
diff --git a/files/zshrc b/files/zshrc
index d808841..6765b01 100644
--- a/files/zshrc
+++ b/files/zshrc
@@ -100,11 +100,18 @@ alias egrep='egrep --color=auto'
 
 # Tool aliases
 alias fd='fdfind'
+alias bat='batcat'  # Ubuntu names it batcat
 alias rg='rg --color=auto'
 alias analyse='fhelp'
-alias ?='fhelp'
 alias help='fhelp'
 
+# Help alias (? needs special handling in zsh)
+if [[ -n "$ZSH_VERSION" ]]; then
+    alias \?='fhelp'
+else
+    alias '?'='fhelp'
+fi
+
 # Quick navigation
 alias ..='cd ..'
 alias ...='cd ../..'